From fd8c019de6a7d9a9f2e5fc67a5ca0960f2705dce Mon Sep 17 00:00:00 2001 From: root Date: Thu, 23 May 2013 23:05:39 +0400 Subject: [PATCH] Sync with portage [Thu May 23 23:05:37 MSK 2013]. --- app-admin/eselect-opengl/ChangeLog | 5 +- app-admin/eselect-opengl/Manifest | 10 +- .../eselect-opengl-1.2.7.ebuild | 4 +- app-benchmarks/siege/ChangeLog | 7 +- app-benchmarks/siege/Manifest | 4 +- app-benchmarks/siege/siege-3.0.1.ebuild | 50 ++ app-emacs/evil/ChangeLog | 7 +- app-emacs/evil/Manifest | 26 +- app-emacs/evil/evil-1.0.2.ebuild | 24 + app-emulation/libvirt/ChangeLog | 9 +- app-emulation/libvirt/Manifest | 34 +- .../libvirt/files/libvirt-1.0.5-sanitytest.py | 36 -- app-emulation/libvirt/files/libvirtd.init-r10 | 128 ----- app-emulation/libvirt/libvirt-1.0.0.ebuild | 410 ---------------- app-emulation/libvirt/libvirt-1.0.3-r1.ebuild | 421 ---------------- app-emulation/libvirt/libvirt-1.0.3-r2.ebuild | 9 +- app-emulation/libvirt/libvirt-1.0.4.ebuild | 9 +- app-emulation/libvirt/libvirt-1.0.5.1.ebuild | 9 +- app-emulation/libvirt/libvirt-1.0.5.ebuild | 426 ---------------- app-emulation/libvirt/libvirt-9999.ebuild | 9 +- app-emulation/xen-pvgrub/ChangeLog | 6 +- app-emulation/xen-pvgrub/Manifest | 10 +- .../xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild | 6 +- app-i18n/transifex-client/ChangeLog | 8 +- app-i18n/transifex-client/Manifest | 32 +- .../transifex-client-0.9.ebuild | 22 + app-misc/gramps/ChangeLog | 7 +- app-misc/gramps/Manifest | 10 +- app-misc/gramps/gramps-3.4.5.ebuild | 90 ++++ app-misc/jq/ChangeLog | 7 +- app-misc/jq/Manifest | 20 +- app-misc/jq/jq-1.3.ebuild | 27 ++ app-text/libodfgen/ChangeLog | 8 +- app-text/libodfgen/Manifest | 32 +- ...en-0.0.1.ebuild => libodfgen-0.0.2.ebuild} | 2 +- app-text/pastebinit/ChangeLog | 5 +- app-text/pastebinit/Manifest | 14 +- .../pastebinit/pastebinit-1.3.1-r1.ebuild | 6 +- app-text/qpdfview/ChangeLog | 5 +- app-text/qpdfview/Manifest | 18 +- app-text/qpdfview/qpdfview-0.4.2-r1.ebuild | 4 +- app-text/sword/ChangeLog | 5 +- app-text/sword/Manifest | 14 +- app-text/sword/sword-1.6.2.ebuild | 4 +- dev-java/icedtea/ChangeLog | 7 +- dev-java/icedtea/Manifest | 26 +- dev-java/icedtea/icedtea-6.1.12.5.ebuild | 311 ++++++++++++ dev-java/jfreechart/ChangeLog | 14 +- dev-java/jfreechart/Manifest | 22 +- .../files/jfreechart-1.0.14-build.xml.patch | 35 ++ ...1.0.14-fix-TimeSeriesCollectionTests.patch | 24 + dev-java/jfreechart/jfreechart-1.0.14.ebuild | 84 ++++ dev-java/jfreechart/metadata.xml | 3 + dev-lang/R/ChangeLog | 7 +- dev-lang/R/Manifest | 14 +- dev-lang/R/R-3.0.1.ebuild | 205 ++++++++ dev-libs/geoip/ChangeLog | 6 +- dev-libs/geoip/Manifest | 24 +- dev-libs/geoip/geoip-1.5.0-r1.ebuild | 4 +- dev-libs/geoip/geoip-1.5.0.ebuild | 4 +- dev-libs/libffi/ChangeLog | 6 +- dev-libs/libffi/Manifest | 10 +- .../libffi-3.0.13-emutramp_pax_proc.patch | 5 + dev-libs/libnl/ChangeLog | 6 +- dev-libs/libnl/Manifest | 20 +- dev-libs/libnl/libnl-3.2.16.ebuild | 51 -- dev-libs/libnl/libnl-3.2.18.ebuild | 47 -- dev-libs/libnl/libnl-3.2.19.ebuild | 47 -- dev-libs/libnl/libnl-3.2.20.ebuild | 49 -- dev-python/beautifulsoup/ChangeLog | 33 +- dev-python/beautifulsoup/Manifest | 22 +- .../beautifulsoup-3.1.0.1-r1.ebuild | 6 +- .../beautifulsoup-3.1.0.1-r2.ebuild | 37 ++ .../beautifulsoup-3.2.1-r1.ebuild | 4 +- .../beautifulsoup-4.1.3-r1.ebuild | 11 +- .../beautifulsoup/beautifulsoup-4.2.0.ebuild | 18 +- .../files/bfs-4.2.0-no-lxml.patch | 67 +++ dev-python/cython/ChangeLog | 8 +- dev-python/cython/Manifest | 21 +- dev-python/cython/cython-0.14.1-r1.ebuild | 53 -- dev-python/cython/cython-0.14.1.ebuild | 52 -- dev-python/cython/cython-0.15.1-r1.ebuild | 57 --- dev-python/cython/cython-0.19.ebuild | 59 +++ dev-python/django-pipeline/ChangeLog | 13 +- dev-python/django-pipeline/Manifest | 10 +- .../django-pipeline-1.3.9.ebuild | 9 +- dev-python/flask/ChangeLog | 11 +- dev-python/flask/Manifest | 11 +- dev-python/flask/flask-0.9-r2.ebuild | 40 ++ dev-python/flask/flask-9999.ebuild | 5 +- dev-python/html5lib/ChangeLog | 5 +- dev-python/html5lib/Manifest | 22 +- dev-python/html5lib/html5lib-0.95-r1.ebuild | 4 +- dev-python/jinja/ChangeLog | 28 +- dev-python/jinja/Manifest | 16 +- .../jinja/files/jinja-2.6-python3.3.patch | 59 --- dev-python/jinja/files/jinja-2.7-docs.patch | 53 ++ dev-python/jinja/jinja-2.6-r100.ebuild | 79 +++ dev-python/jinja/jinja-2.6-r2.ebuild | 7 +- dev-python/jinja/jinja-2.7.ebuild | 14 +- dev-python/jsmin/ChangeLog | 9 + dev-python/jsmin/Manifest | 14 + dev-python/jsmin/jsmin-2.0.3.ebuild | 26 + dev-python/jsmin/metadata.xml | 5 + dev-python/lxml/ChangeLog | 13 +- dev-python/lxml/Manifest | 18 +- dev-python/lxml/lxml-3.2.0.ebuild | 2 +- dev-python/lxml/lxml-3.2.1.ebuild | 19 +- dev-python/lxml/metadata.xml | 3 + dev-python/ply/ChangeLog | 5 +- dev-python/ply/Manifest | 14 +- dev-python/ply/ply-3.4.ebuild | 4 +- dev-python/py/ChangeLog | 7 +- dev-python/py/Manifest | 24 +- dev-python/py/py-1.4.14.ebuild | 28 ++ dev-python/python-memcached/ChangeLog | 8 +- dev-python/python-memcached/Manifest | 13 +- .../python-memcached-1.48-r1.ebuild | 35 ++ dev-python/rdflib/ChangeLog | 7 +- dev-python/rdflib/Manifest | 14 +- dev-python/rdflib/rdflib-4.0.1.ebuild | 52 ++ dev-python/sphinx/ChangeLog | 8 +- dev-python/sphinx/Manifest | 21 +- dev-python/sphinx/sphinx-1.1.3-r7.ebuild | 128 +++++ dev-python/xlrd/ChangeLog | 7 +- dev-python/xlrd/Manifest | 14 +- dev-python/xlrd/xlrd-0.9.2.ebuild | 38 ++ dev-ruby/amq-client/ChangeLog | 7 +- dev-ruby/amq-client/Manifest | 10 +- dev-ruby/amq-client/amq-client-1.0.2.ebuild | 36 ++ dev-ruby/amq-protocol/ChangeLog | 7 +- dev-ruby/amq-protocol/Manifest | 10 +- .../amq-protocol/amq-protocol-1.6.0.ebuild | 26 + dev-ruby/amqp/ChangeLog | 7 +- dev-ruby/amqp/Manifest | 10 +- dev-ruby/amqp/amqp-0.9.7.ebuild | 39 -- dev-ruby/mocha/ChangeLog | 11 +- dev-ruby/mocha/Manifest | 20 +- dev-ruby/mocha/mocha-0.10.5.ebuild | 4 +- dev-ruby/mocha/mocha-0.11.4.ebuild | 4 +- dev-ruby/mocha/mocha-0.12.7.ebuild | 4 +- dev-ruby/mocha/mocha-0.13.0.ebuild | 38 -- dev-ruby/mocha/mocha-0.13.1.ebuild | 38 -- dev-ruby/mocha/mocha-0.13.3.ebuild | 4 +- dev-ruby/transaction-simple/ChangeLog | 6 +- dev-ruby/transaction-simple/Manifest | 22 +- .../transaction-simple-1.4.0.2.ebuild | 4 +- dev-util/debootstrap/ChangeLog | 7 +- dev-util/debootstrap/Manifest | 10 +- .../debootstrap/debootstrap-1.0.52.ebuild | 45 ++ dev-util/eric/ChangeLog | 6 +- dev-util/eric/Manifest | 26 +- dev-util/eric/eric-4.5.10.ebuild | 4 +- dev-util/eric/eric-5.3.2.ebuild | 4 +- dev-vcs/bzr-explorer/ChangeLog | 6 +- dev-vcs/bzr-explorer/Manifest | 24 +- .../bzr-explorer/bzr-explorer-1.2.1.ebuild | 31 -- .../bzr-explorer/bzr-explorer-1.2.2.ebuild | 31 -- dev-vcs/tortoisehg/ChangeLog | 6 +- dev-vcs/tortoisehg/Manifest | 12 +- dev-vcs/tortoisehg/tortoisehg-2.8.ebuild | 4 +- dev-vcs/tortoisehg/tortoisehg-9999.ebuild | 4 +- games-misc/katawa-shoujo/ChangeLog | 5 +- games-misc/katawa-shoujo/Manifest | 26 +- .../katawa-shoujo/katawa-shoujo-1.0-r1.ebuild | 4 +- kde-misc/akonadi-git-resource/ChangeLog | 11 +- kde-misc/akonadi-git-resource/Manifest | 28 +- .../akonadi-git-resource-0_p20130522.ebuild | 22 + mail-client/clawsker/ChangeLog | 9 +- mail-client/clawsker/Manifest | 10 +- mail-client/clawsker/clawsker-0.7.10.ebuild | 24 + mail-client/sylpheed/ChangeLog | 5 +- mail-client/sylpheed/Manifest | 22 +- mail-client/sylpheed/sylpheed-3.2.0.ebuild | 55 --- media-fonts/mplus-outline-fonts/ChangeLog | 27 +- media-fonts/mplus-outline-fonts/Manifest | 19 +- .../mplus-outline-fonts-0_pre040.ebuild | 46 -- .../mplus-outline-fonts-0_pre043-r1.ebuild | 46 -- .../mplus-outline-fonts-0_pre043.ebuild | 46 -- .../mplus-outline-fonts-0_pre052.ebuild | 6 +- ...ld => mplus-outline-fonts-0_pre055.ebuild} | 6 +- media-gfx/ufraw/ChangeLog | 5 +- media-gfx/ufraw/Manifest | 28 +- media-gfx/ufraw/ufraw-0.19.2.ebuild | 8 +- media-libs/libcdr/ChangeLog | 5 +- media-libs/libcdr/Manifest | 32 +- media-libs/libcdr/libcdr-0.0.14.ebuild | 6 +- media-libs/mesa/ChangeLog | 11 +- media-libs/mesa/Manifest | 16 +- media-libs/mesa/mesa-9.1.2-r1.ebuild | 4 +- media-libs/mesa/mesa-9.1.3.ebuild | 418 ++++++++++++++++ media-sound/mpg123/ChangeLog | 7 +- media-sound/mpg123/Manifest | 20 +- media-sound/mpg123/mpg123-1.15.4.ebuild | 85 ++++ media-sound/ncmpc/ChangeLog | 5 +- media-sound/ncmpc/Manifest | 22 +- media-sound/ncmpc/ncmpc-0.21.ebuild | 4 +- media-video/ffmpeg/ChangeLog | 9 +- media-video/ffmpeg/Manifest | 14 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 9 +- media-video/ffmpeg/metadata.xml | 1 + media-video/handbrake/ChangeLog | 8 +- media-video/handbrake/Manifest | 22 +- media-video/handbrake/handbrake-0.9.9.ebuild | 174 +++++++ media-video/handbrake/handbrake-9999.ebuild | 7 +- media-video/libav/ChangeLog | 8 +- media-video/libav/Manifest | 22 +- media-video/libav/libav-0.8.7.ebuild | 8 +- metadata/dtd/timestamp.chk | 2 +- metadata/glsa/timestamp.chk | 2 +- .../md5-cache/app-admin/eselect-opengl-1.2.7 | 4 +- metadata/md5-cache/app-benchmarks/siege-3.0.1 | 13 + metadata/md5-cache/app-emacs/evil-1.0.2 | 12 + .../md5-cache/app-emulation/libvirt-1.0.0 | 14 - .../md5-cache/app-emulation/libvirt-1.0.3-r1 | 14 - .../md5-cache/app-emulation/libvirt-1.0.3-r2 | 2 +- .../md5-cache/app-emulation/libvirt-1.0.4 | 2 +- .../md5-cache/app-emulation/libvirt-1.0.5 | 14 - .../md5-cache/app-emulation/libvirt-1.0.5.1 | 2 +- metadata/md5-cache/app-emulation/libvirt-9999 | 2 +- .../app-emulation/xen-pvgrub-4.2.1-r2 | 4 +- .../md5-cache/app-i18n/transifex-client-0.9 | 12 + metadata/md5-cache/app-misc/gramps-3.4.5 | 13 + metadata/md5-cache/app-misc/jq-1.3 | 12 + .../{libodfgen-0.0.1 => libodfgen-0.0.2} | 4 +- .../md5-cache/app-text/pastebinit-1.3.1-r1 | 4 +- metadata/md5-cache/app-text/qpdfview-0.4.2-r1 | 4 +- metadata/md5-cache/app-text/sword-1.6.2 | 3 +- metadata/md5-cache/dev-java/icedtea-6.1.12.5 | 14 + metadata/md5-cache/dev-java/jfreechart-1.0.14 | 13 + metadata/md5-cache/dev-lang/R-3.0.1 | 15 + metadata/md5-cache/dev-libs/geoip-1.5.0 | 4 +- metadata/md5-cache/dev-libs/geoip-1.5.0-r1 | 4 +- metadata/md5-cache/dev-libs/libnl-3.2.16 | 12 - metadata/md5-cache/dev-libs/libnl-3.2.18 | 12 - metadata/md5-cache/dev-libs/libnl-3.2.19 | 12 - metadata/md5-cache/dev-libs/libnl-3.2.20 | 12 - .../dev-python/beautifulsoup-3.1.0.1-r1 | 4 +- .../dev-python/beautifulsoup-3.1.0.1-r2 | 14 + .../dev-python/beautifulsoup-3.2.1-r1 | 4 +- .../dev-python/beautifulsoup-4.1.3-r1 | 2 +- .../md5-cache/dev-python/beautifulsoup-4.2.0 | 10 +- metadata/md5-cache/dev-python/cython-0.14.1 | 13 - .../md5-cache/dev-python/cython-0.14.1-r1 | 13 - .../md5-cache/dev-python/cython-0.15.1-r1 | 13 - metadata/md5-cache/dev-python/cython-0.19 | 14 + .../dev-python/django-pipeline-1.3.9 | 6 +- metadata/md5-cache/dev-python/flask-0.9-r2 | 14 + metadata/md5-cache/dev-python/flask-9999 | 6 +- .../md5-cache/dev-python/html5lib-0.95-r1 | 4 +- metadata/md5-cache/dev-python/jinja-2.6-r100 | 14 + metadata/md5-cache/dev-python/jinja-2.6-r2 | 2 +- metadata/md5-cache/dev-python/jinja-2.7 | 2 +- metadata/md5-cache/dev-python/jsmin-2.0.3 | 14 + metadata/md5-cache/dev-python/lxml-3.2.0 | 2 +- metadata/md5-cache/dev-python/lxml-3.2.1 | 8 +- metadata/md5-cache/dev-python/ply-3.4 | 4 +- metadata/md5-cache/dev-python/py-1.4.14 | 14 + .../dev-python/python-memcached-1.48-r1 | 14 + metadata/md5-cache/dev-python/rdflib-4.0.1 | 14 + metadata/md5-cache/dev-python/sphinx-1.1.3-r7 | 14 + metadata/md5-cache/dev-python/xlrd-0.9.2 | 14 + metadata/md5-cache/dev-ruby/amq-client-1.0.2 | 14 + .../md5-cache/dev-ruby/amq-protocol-1.6.0 | 14 + metadata/md5-cache/dev-ruby/amqp-0.9.7 | 14 - metadata/md5-cache/dev-ruby/mocha-0.10.5 | 4 +- metadata/md5-cache/dev-ruby/mocha-0.11.4 | 4 +- metadata/md5-cache/dev-ruby/mocha-0.12.7 | 4 +- metadata/md5-cache/dev-ruby/mocha-0.13.0 | 14 - metadata/md5-cache/dev-ruby/mocha-0.13.1 | 14 - metadata/md5-cache/dev-ruby/mocha-0.13.3 | 4 +- .../dev-ruby/transaction-simple-1.4.0.2 | 4 +- .../md5-cache/dev-util/debootstrap-1.0.52 | 11 + metadata/md5-cache/dev-util/eric-4.5.10 | 4 +- metadata/md5-cache/dev-util/eric-5.3.2 | 4 +- metadata/md5-cache/dev-vcs/bzr-explorer-1.2.1 | 13 - metadata/md5-cache/dev-vcs/bzr-explorer-1.2.2 | 13 - metadata/md5-cache/dev-vcs/tortoisehg-2.8 | 6 +- metadata/md5-cache/dev-vcs/tortoisehg-9999 | 6 +- .../md5-cache/games-misc/katawa-shoujo-1.0-r1 | 4 +- .../kde-misc/akonadi-git-resource-0_p20130522 | 13 + .../md5-cache/mail-client/clawsker-0.7.10 | 9 + metadata/md5-cache/mail-client/sylpheed-3.2.0 | 13 - .../media-fonts/mplus-outline-fonts-0_pre040 | 14 - .../media-fonts/mplus-outline-fonts-0_pre043 | 14 - .../mplus-outline-fonts-0_pre043-r1 | 14 - .../media-fonts/mplus-outline-fonts-0_pre052 | 4 +- ...-0_pre046 => mplus-outline-fonts-0_pre055} | 6 +- metadata/md5-cache/media-gfx/ufraw-0.19.2 | 4 +- metadata/md5-cache/media-libs/libcdr-0.0.14 | 2 +- metadata/md5-cache/media-libs/mesa-9.1.2-r1 | 4 +- metadata/md5-cache/media-libs/mesa-9.1.3 | 14 + metadata/md5-cache/media-sound/mpg123-1.15.4 | 13 + metadata/md5-cache/media-sound/ncmpc-0.21 | 4 +- metadata/md5-cache/media-video/ffmpeg-9999 | 8 +- .../md5-cache/media-video/handbrake-0.9.9 | 14 + metadata/md5-cache/media-video/handbrake-9999 | 6 +- metadata/md5-cache/media-video/libav-0.8.7 | 4 +- .../md5-cache/net-analyzer/etherape-0.9.13 | 13 + metadata/md5-cache/net-analyzer/fping-3.5 | 10 + .../{munin-2.0.13 => munin-2.0.14} | 4 +- ...eshark-1.10.0_rc1 => wireshark-1.10.0_rc2} | 6 +- metadata/md5-cache/net-dns/pdns-3.2 | 6 +- metadata/md5-cache/net-ftp/lftp-4.4.7 | 14 + metadata/md5-cache/net-im/skype-4.2.0.11 | 14 + metadata/md5-cache/net-irc/weechat-0.4.1 | 13 + metadata/md5-cache/net-libs/gnutls-3.2.0 | 6 +- metadata/md5-cache/net-libs/libkgapi-0.4.4 | 4 +- metadata/md5-cache/net-libs/libkgapi-2.0.0 | 13 + metadata/md5-cache/net-mail/libpst-0.6.59 | 13 + .../md5-cache/net-misc/apt-cacher-ng-0.7.13 | 13 + .../md5-cache/net-misc/rabbitmq-server-3.1.0 | 13 - .../md5-cache/net-misc/rabbitmq-server-3.1.1 | 6 +- .../{numbat-0.999 => numbat-0.999-r1} | 4 +- .../md5-cache/sci-libs/ceres-solver-1.6.0 | 14 + .../crmsh-1.2.5-r1 => sci-libs/mpir-2.6.0-r2} | 18 +- metadata/md5-cache/sys-apps/gptfdisk-0.8.6 | 2 +- metadata/md5-cache/sys-apps/hwids-20130523 | 13 + .../sys-apps/{lnxhc-1.2 => lnxhc-1.2-r1} | 2 +- metadata/md5-cache/sys-apps/which-2.20-r1 | 10 + metadata/md5-cache/sys-cluster/crmsh-1.2.5-r2 | 13 + metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 | 6 +- metadata/md5-cache/sys-fs/lvm2-2.02.97 | 6 +- metadata/md5-cache/sys-fs/lvm2-2.02.97-r1 | 6 +- metadata/md5-cache/sys-fs/lvm2-2.02.98 | 6 +- .../md5-cache/sys-kernel/pf-sources-3.9.3 | 15 + .../www-client/chromium-27.0.1453.93 | 6 +- .../x11-drivers/nvidia-drivers-319.23 | 15 + metadata/md5-cache/x11-libs/libdrm-2.4.45 | 4 +- metadata/md5-cache/x11-misc/dmenu-4.5-r3 | 2 +- metadata/md5-cache/x11-wm/goomwwm-1.0.0 | 13 + metadata/news/timestamp.chk | 2 +- metadata/timestamp | 2 +- metadata/timestamp.calculate | 362 ++++++++------ metadata/timestamp.chk | 2 +- metadata/timestamp.x | 2 +- net-analyzer/etherape/ChangeLog | 9 +- net-analyzer/etherape/Manifest | 22 +- net-analyzer/etherape/etherape-0.9.13.ebuild | 27 ++ net-analyzer/fping/ChangeLog | 9 +- net-analyzer/fping/Manifest | 16 +- net-analyzer/fping/fping-3.5.ebuild | 27 ++ net-analyzer/munin/ChangeLog | 8 +- net-analyzer/munin/Manifest | 24 +- ...unin-2.0.13.ebuild => munin-2.0.14.ebuild} | 2 +- net-analyzer/wireshark/ChangeLog | 8 +- net-analyzer/wireshark/Manifest | 25 +- .../files/wireshark-1.10.0-pkg-config.patch | 12 - ...rc1.ebuild => wireshark-1.10.0_rc2.ebuild} | 5 +- net-dns/pdns/ChangeLog | 6 +- net-dns/pdns/Manifest | 20 +- net-dns/pdns/pdns-3.2.ebuild | 64 ++- net-ftp/lftp/ChangeLog | 7 +- net-ftp/lftp/Manifest | 10 +- net-ftp/lftp/lftp-4.4.7.ebuild | 72 +++ net-im/skype/ChangeLog | 7 +- net-im/skype/Manifest | 26 +- net-im/skype/skype-4.2.0.11.ebuild | 108 +++++ net-irc/weechat/ChangeLog | 7 +- net-irc/weechat/Manifest | 30 +- net-irc/weechat/weechat-0.4.1.ebuild | 131 +++++ net-libs/gnutls/ChangeLog | 5 +- net-libs/gnutls/Manifest | 18 +- net-libs/gnutls/gnutls-3.2.0.ebuild | 4 +- net-libs/libkgapi/ChangeLog | 8 +- net-libs/libkgapi/Manifest | 28 +- net-libs/libkgapi/libkgapi-0.4.4.ebuild | 4 +- net-libs/libkgapi/libkgapi-2.0.0.ebuild | 33 ++ net-mail/libpst/ChangeLog | 7 +- net-mail/libpst/Manifest | 24 +- net-mail/libpst/libpst-0.6.59.ebuild | 63 +++ net-misc/apt-cacher-ng/ChangeLog | 7 +- net-misc/apt-cacher-ng/Manifest | 10 +- .../apt-cacher-ng/apt-cacher-ng-0.7.13.ebuild | 110 +++++ net-misc/rabbitmq-server/ChangeLog | 6 +- net-misc/rabbitmq-server/Manifest | 12 +- .../rabbitmq-server-3.1.0.ebuild | 95 ---- .../rabbitmq-server-3.1.1.ebuild | 5 +- profiles/ChangeLog | 5 +- profiles/updates/2Q-2013 | 4 + profiles/use.local.desc | 3 + sci-chemistry/numbat/ChangeLog | 8 +- sci-chemistry/numbat/Manifest | 11 +- .../numbat/files/numbat-0.999-gnuplot.patch | 42 ++ ...at-0.999.ebuild => numbat-0.999-r1.ebuild} | 11 +- sci-libs/ceres-solver/ChangeLog | 8 +- sci-libs/ceres-solver/Manifest | 12 +- .../ceres-solver/ceres-solver-1.6.0.ebuild | 86 ++++ sci-libs/mpir/ChangeLog | 8 +- sci-libs/mpir/Manifest | 10 +- sci-libs/mpir/files/mpir-2.6.0-gcc48.patch | 13 + sci-libs/mpir/mpir-2.6.0-r2.ebuild | 64 +++ sys-apps/gptfdisk/ChangeLog | 5 +- sys-apps/gptfdisk/Manifest | 20 +- sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild | 4 +- sys-apps/hwids/ChangeLog | 7 +- sys-apps/hwids/Manifest | 18 +- sys-apps/hwids/hwids-20130523.ebuild | 44 ++ sys-apps/lnxhc/ChangeLog | 9 +- sys-apps/lnxhc/Manifest | 13 +- .../lnxhc/files/lnxhc-1.2-ifconfig-path.patch | 23 + .../{lnxhc-1.2.ebuild => lnxhc-1.2-r1.ebuild} | 3 +- sys-apps/which/ChangeLog | 7 +- sys-apps/which/Manifest | 19 +- sys-apps/which/which-2.20-r1.ebuild | 20 + sys-cluster/crmsh/ChangeLog | 8 +- sys-cluster/crmsh/Manifest | 12 +- ...-1.2.5-r1.ebuild => crmsh-1.2.5-r2.ebuild} | 26 +- sys-fs/lvm2/ChangeLog | 7 +- sys-fs/lvm2/Manifest | 20 +- sys-fs/lvm2/lvm2-2.02.95-r4.ebuild | 6 +- sys-fs/lvm2/lvm2-2.02.97-r1.ebuild | 4 +- sys-fs/lvm2/lvm2-2.02.97.ebuild | 6 +- sys-fs/lvm2/lvm2-2.02.98.ebuild | 4 +- sys-kernel/pf-sources/ChangeLog | 7 +- sys-kernel/pf-sources/Manifest | 32 +- sys-kernel/pf-sources/pf-sources-3.9.3.ebuild | 74 +++ www-client/chromium/ChangeLog | 7 +- www-client/chromium/Manifest | 10 +- .../chromium/chromium-27.0.1453.93.ebuild | 7 +- x11-drivers/nvidia-drivers/ChangeLog | 7 +- x11-drivers/nvidia-drivers/Manifest | 15 +- .../nvidia-drivers-319.23.ebuild | 459 ++++++++++++++++++ x11-libs/libdrm/ChangeLog | 5 +- x11-libs/libdrm/Manifest | 14 +- x11-libs/libdrm/libdrm-2.4.45.ebuild | 4 +- x11-misc/dmenu/ChangeLog | 6 +- x11-misc/dmenu/Manifest | 11 +- x11-misc/dmenu/dmenu-4.5-r3.ebuild | 4 +- x11-misc/dmenu/files/dmenu-4.5-xft-2.patch | 410 ++++++++++++++++ x11-wm/goomwwm/ChangeLog | 12 + x11-wm/goomwwm/Manifest | 14 + x11-wm/goomwwm/goomwwm-1.0.0.ebuild | 43 ++ x11-wm/goomwwm/metadata.xml | 9 + 434 files changed, 6677 insertions(+), 3920 deletions(-) create mode 100644 app-benchmarks/siege/siege-3.0.1.ebuild create mode 100644 app-emacs/evil/evil-1.0.2.ebuild delete mode 100644 app-emulation/libvirt/files/libvirt-1.0.5-sanitytest.py delete mode 100644 app-emulation/libvirt/files/libvirtd.init-r10 delete mode 100644 app-emulation/libvirt/libvirt-1.0.0.ebuild delete mode 100644 app-emulation/libvirt/libvirt-1.0.3-r1.ebuild delete mode 100644 app-emulation/libvirt/libvirt-1.0.5.ebuild create mode 100644 app-i18n/transifex-client/transifex-client-0.9.ebuild create mode 100644 app-misc/gramps/gramps-3.4.5.ebuild create mode 100644 app-misc/jq/jq-1.3.ebuild rename app-text/libodfgen/{libodfgen-0.0.1.ebuild => libodfgen-0.0.2.ebuild} (93%) create mode 100644 dev-java/icedtea/icedtea-6.1.12.5.ebuild create mode 100644 dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch create mode 100644 dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch create mode 100644 dev-java/jfreechart/jfreechart-1.0.14.ebuild create mode 100644 dev-lang/R/R-3.0.1.ebuild delete mode 100644 dev-libs/libnl/libnl-3.2.16.ebuild delete mode 100644 dev-libs/libnl/libnl-3.2.18.ebuild delete mode 100644 dev-libs/libnl/libnl-3.2.19.ebuild delete mode 100644 dev-libs/libnl/libnl-3.2.20.ebuild create mode 100644 dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild create mode 100644 dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch delete mode 100644 dev-python/cython/cython-0.14.1-r1.ebuild delete mode 100644 dev-python/cython/cython-0.14.1.ebuild delete mode 100644 dev-python/cython/cython-0.15.1-r1.ebuild create mode 100644 dev-python/cython/cython-0.19.ebuild create mode 100644 dev-python/flask/flask-0.9-r2.ebuild create mode 100644 dev-python/jinja/files/jinja-2.7-docs.patch create mode 100644 dev-python/jinja/jinja-2.6-r100.ebuild create mode 100644 dev-python/jsmin/ChangeLog create mode 100644 dev-python/jsmin/Manifest create mode 100644 dev-python/jsmin/jsmin-2.0.3.ebuild create mode 100644 dev-python/jsmin/metadata.xml create mode 100644 dev-python/py/py-1.4.14.ebuild create mode 100644 dev-python/python-memcached/python-memcached-1.48-r1.ebuild create mode 100644 dev-python/rdflib/rdflib-4.0.1.ebuild create mode 100644 dev-python/sphinx/sphinx-1.1.3-r7.ebuild create mode 100644 dev-python/xlrd/xlrd-0.9.2.ebuild create mode 100644 dev-ruby/amq-client/amq-client-1.0.2.ebuild create mode 100644 dev-ruby/amq-protocol/amq-protocol-1.6.0.ebuild delete mode 100644 dev-ruby/amqp/amqp-0.9.7.ebuild delete mode 100644 dev-ruby/mocha/mocha-0.13.0.ebuild delete mode 100644 dev-ruby/mocha/mocha-0.13.1.ebuild create mode 100644 dev-util/debootstrap/debootstrap-1.0.52.ebuild delete mode 100644 dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild delete mode 100644 dev-vcs/bzr-explorer/bzr-explorer-1.2.2.ebuild create mode 100644 kde-misc/akonadi-git-resource/akonadi-git-resource-0_p20130522.ebuild create mode 100644 mail-client/clawsker/clawsker-0.7.10.ebuild delete mode 100644 mail-client/sylpheed/sylpheed-3.2.0.ebuild delete mode 100644 media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre040.ebuild delete mode 100644 media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043-r1.ebuild delete mode 100644 media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043.ebuild rename media-fonts/mplus-outline-fonts/{mplus-outline-fonts-0_pre046.ebuild => mplus-outline-fonts-0_pre055.ebuild} (88%) create mode 100644 media-libs/mesa/mesa-9.1.3.ebuild create mode 100644 media-sound/mpg123/mpg123-1.15.4.ebuild create mode 100644 media-video/handbrake/handbrake-0.9.9.ebuild create mode 100644 metadata/md5-cache/app-benchmarks/siege-3.0.1 create mode 100644 metadata/md5-cache/app-emacs/evil-1.0.2 delete mode 100644 metadata/md5-cache/app-emulation/libvirt-1.0.0 delete mode 100644 metadata/md5-cache/app-emulation/libvirt-1.0.3-r1 delete mode 100644 metadata/md5-cache/app-emulation/libvirt-1.0.5 create mode 100644 metadata/md5-cache/app-i18n/transifex-client-0.9 create mode 100644 metadata/md5-cache/app-misc/gramps-3.4.5 create mode 100644 metadata/md5-cache/app-misc/jq-1.3 rename metadata/md5-cache/app-text/{libodfgen-0.0.1 => libodfgen-0.0.2} (84%) create mode 100644 metadata/md5-cache/dev-java/icedtea-6.1.12.5 create mode 100644 metadata/md5-cache/dev-java/jfreechart-1.0.14 create mode 100644 metadata/md5-cache/dev-lang/R-3.0.1 delete mode 100644 metadata/md5-cache/dev-libs/libnl-3.2.16 delete mode 100644 metadata/md5-cache/dev-libs/libnl-3.2.18 delete mode 100644 metadata/md5-cache/dev-libs/libnl-3.2.19 delete mode 100644 metadata/md5-cache/dev-libs/libnl-3.2.20 create mode 100644 metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2 delete mode 100644 metadata/md5-cache/dev-python/cython-0.14.1 delete mode 100644 metadata/md5-cache/dev-python/cython-0.14.1-r1 delete mode 100644 metadata/md5-cache/dev-python/cython-0.15.1-r1 create mode 100644 metadata/md5-cache/dev-python/cython-0.19 create mode 100644 metadata/md5-cache/dev-python/flask-0.9-r2 create mode 100644 metadata/md5-cache/dev-python/jinja-2.6-r100 create mode 100644 metadata/md5-cache/dev-python/jsmin-2.0.3 create mode 100644 metadata/md5-cache/dev-python/py-1.4.14 create mode 100644 metadata/md5-cache/dev-python/python-memcached-1.48-r1 create mode 100644 metadata/md5-cache/dev-python/rdflib-4.0.1 create mode 100644 metadata/md5-cache/dev-python/sphinx-1.1.3-r7 create mode 100644 metadata/md5-cache/dev-python/xlrd-0.9.2 create mode 100644 metadata/md5-cache/dev-ruby/amq-client-1.0.2 create mode 100644 metadata/md5-cache/dev-ruby/amq-protocol-1.6.0 delete mode 100644 metadata/md5-cache/dev-ruby/amqp-0.9.7 delete mode 100644 metadata/md5-cache/dev-ruby/mocha-0.13.0 delete mode 100644 metadata/md5-cache/dev-ruby/mocha-0.13.1 create mode 100644 metadata/md5-cache/dev-util/debootstrap-1.0.52 delete mode 100644 metadata/md5-cache/dev-vcs/bzr-explorer-1.2.1 delete mode 100644 metadata/md5-cache/dev-vcs/bzr-explorer-1.2.2 create mode 100644 metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20130522 create mode 100644 metadata/md5-cache/mail-client/clawsker-0.7.10 delete mode 100644 metadata/md5-cache/mail-client/sylpheed-3.2.0 delete mode 100644 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre040 delete mode 100644 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043 delete mode 100644 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043-r1 rename metadata/md5-cache/media-fonts/{mplus-outline-fonts-0_pre046 => mplus-outline-fonts-0_pre055} (93%) create mode 100644 metadata/md5-cache/media-libs/mesa-9.1.3 create mode 100644 metadata/md5-cache/media-sound/mpg123-1.15.4 create mode 100644 metadata/md5-cache/media-video/handbrake-0.9.9 create mode 100644 metadata/md5-cache/net-analyzer/etherape-0.9.13 create mode 100644 metadata/md5-cache/net-analyzer/fping-3.5 rename metadata/md5-cache/net-analyzer/{munin-2.0.13 => munin-2.0.14} (95%) rename metadata/md5-cache/net-analyzer/{wireshark-1.10.0_rc1 => wireshark-1.10.0_rc2} (97%) create mode 100644 metadata/md5-cache/net-ftp/lftp-4.4.7 create mode 100644 metadata/md5-cache/net-im/skype-4.2.0.11 create mode 100644 metadata/md5-cache/net-irc/weechat-0.4.1 create mode 100644 metadata/md5-cache/net-libs/libkgapi-2.0.0 create mode 100644 metadata/md5-cache/net-mail/libpst-0.6.59 create mode 100644 metadata/md5-cache/net-misc/apt-cacher-ng-0.7.13 delete mode 100644 metadata/md5-cache/net-misc/rabbitmq-server-3.1.0 rename metadata/md5-cache/sci-chemistry/{numbat-0.999 => numbat-0.999-r1} (90%) create mode 100644 metadata/md5-cache/sci-libs/ceres-solver-1.6.0 rename metadata/md5-cache/{sys-cluster/crmsh-1.2.5-r1 => sci-libs/mpir-2.6.0-r2} (53%) create mode 100644 metadata/md5-cache/sys-apps/hwids-20130523 rename metadata/md5-cache/sys-apps/{lnxhc-1.2 => lnxhc-1.2-r1} (91%) create mode 100644 metadata/md5-cache/sys-apps/which-2.20-r1 create mode 100644 metadata/md5-cache/sys-cluster/crmsh-1.2.5-r2 create mode 100644 metadata/md5-cache/sys-kernel/pf-sources-3.9.3 create mode 100644 metadata/md5-cache/x11-drivers/nvidia-drivers-319.23 create mode 100644 metadata/md5-cache/x11-wm/goomwwm-1.0.0 create mode 100644 net-analyzer/etherape/etherape-0.9.13.ebuild create mode 100644 net-analyzer/fping/fping-3.5.ebuild rename net-analyzer/munin/{munin-2.0.13.ebuild => munin-2.0.14.ebuild} (99%) delete mode 100644 net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch rename net-analyzer/wireshark/{wireshark-1.10.0_rc1.ebuild => wireshark-1.10.0_rc2.ebuild} (97%) create mode 100644 net-ftp/lftp/lftp-4.4.7.ebuild create mode 100644 net-im/skype/skype-4.2.0.11.ebuild create mode 100644 net-irc/weechat/weechat-0.4.1.ebuild create mode 100644 net-libs/libkgapi/libkgapi-2.0.0.ebuild create mode 100644 net-mail/libpst/libpst-0.6.59.ebuild create mode 100644 net-misc/apt-cacher-ng/apt-cacher-ng-0.7.13.ebuild delete mode 100644 net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild create mode 100644 sci-chemistry/numbat/files/numbat-0.999-gnuplot.patch rename sci-chemistry/numbat/{numbat-0.999.ebuild => numbat-0.999-r1.ebuild} (82%) create mode 100644 sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild create mode 100644 sci-libs/mpir/files/mpir-2.6.0-gcc48.patch create mode 100644 sci-libs/mpir/mpir-2.6.0-r2.ebuild create mode 100644 sys-apps/hwids/hwids-20130523.ebuild create mode 100644 sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch rename sys-apps/lnxhc/{lnxhc-1.2.ebuild => lnxhc-1.2-r1.ebuild} (72%) create mode 100644 sys-apps/which/which-2.20-r1.ebuild rename sys-cluster/crmsh/{crmsh-1.2.5-r1.ebuild => crmsh-1.2.5-r2.ebuild} (63%) create mode 100644 sys-kernel/pf-sources/pf-sources-3.9.3.ebuild create mode 100644 x11-drivers/nvidia-drivers/nvidia-drivers-319.23.ebuild create mode 100644 x11-misc/dmenu/files/dmenu-4.5-xft-2.patch create mode 100644 x11-wm/goomwwm/ChangeLog create mode 100644 x11-wm/goomwwm/Manifest create mode 100644 x11-wm/goomwwm/goomwwm-1.0.0.ebuild create mode 100644 x11-wm/goomwwm/metadata.xml diff --git a/app-admin/eselect-opengl/ChangeLog b/app-admin/eselect-opengl/ChangeLog index 12fa94c87000..e7f0a733c92e 100644 --- a/app-admin/eselect-opengl/ChangeLog +++ b/app-admin/eselect-opengl/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-admin/eselect-opengl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.113 2013/02/27 05:48:54 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/ChangeLog,v 1.114 2013/05/23 15:22:29 jer Exp $ + + 23 May 2013; Jeroen Roovers eselect-opengl-1.2.7.ebuild: + Stable for HPPA (bug #463430). 27 Feb 2013; Zac Medico eselect-opengl-1.2.7.ebuild: Add ~arm-linux keyword. diff --git a/app-admin/eselect-opengl/Manifest b/app-admin/eselect-opengl/Manifest index 458cbded612a..1a043bc16ba0 100644 --- a/app-admin/eselect-opengl/Manifest +++ b/app-admin/eselect-opengl/Manifest @@ -20,13 +20,13 @@ EBUILD eselect-opengl-1.2.4.ebuild 1374 SHA256 bcc832ec284494d58dc74e6a9d0d02e43 EBUILD eselect-opengl-1.2.5-r1.ebuild 1568 SHA256 1138ab6bf47256de5d641f896731341b562dd6687c56b1927bbd6d0f2f841140 SHA512 aca029ad1bf28d3a85672d4c327c2f0c444e542e183e7bec4a45f2e2639d7f8836575123a8fc471a40fe829319c545d2752b9724b66241290812e1cbc4529d79 WHIRLPOOL bdc39ab2c0e0d60bd6ec77fe69cd06d1b88f1c7b6c90468186d13f18dc7d38b997db1c53a6d6b7854795021ee84cd056e0b0d3ca2593160f481a88a94c21e0d3 EBUILD eselect-opengl-1.2.6.1.ebuild 1629 SHA256 61e27d7fcd4fd9e15fdc9b5c24bef194e3fc13469409ae83cb860de8b489c990 SHA512 f75756fc9f7216db81d0c3bb3b08334e3fe12679803d6ee434e8e07f53ed8076abb3f853bfe91ab3edd5c0ee7b6370eaed237f2747b69aa62a42b5d8b225cc3b WHIRLPOOL da16f0634842687fb1c6188540d111b1ee2e082ea6a552418225af0c1b07468ad836918dbf6d11a5860fdb077ff578a96df2008e483829bde96c6e9252071b75 EBUILD eselect-opengl-1.2.6.ebuild 1642 SHA256 bb44047e294a8c6a231774a9dace9ba9e3d47e509a0b5e4d5e335e46559ab019 SHA512 903c24b2847f83ad029c6955d14d19a33083443e9f4ece23e32532f324a01c5fc8072b69eb3889151215f23956a7d4a48debc10b1dad49940bb2e6b13ad39f94 WHIRLPOOL c33eb863f6e1c7e34569d7014f180cc13fcd0fb3b8ce19b747d9f3b3cab1e187ff193007c5900ad238aeddaa6144e59644a238ec39e3f203ee1c3c9a98a8a598 -EBUILD eselect-opengl-1.2.7.ebuild 1618 SHA256 87a7b8b30d3eaacda4b29d4421a7faab6108a33abab1eb251827ad3419acd88f SHA512 f03e7386899fa6f2340575c1299b4fb03624299fb2e621e3d061d81ddeaf77fd351f2d103a16b8d08f47453015cb16d9ab8e9ab547924d2fca41e9e691b16f2a WHIRLPOOL acecc70b576ae7175ec2c93590babd0fbb11c9ab45901f65849323eaab2bf45887bc6db293a7e8038b8e4038125e4e667d6c5bca63fcac5d321b3ff0af72ff3d -MISC ChangeLog 16805 SHA256 8767e8a18de54e62f184d6c22c5ace97a5dd4a9897ce68ad18daf6e09bcb9c90 SHA512 2675bd5103edda97732588f73703a38e39f20e67ad5b630f485e5cc9da2b252a912902f251fd2657874227eef81e6b69ddfc87447255108f5f773729c920364a WHIRLPOOL 1fff66ba5735a7641e6da0e090333c6671a15e40cee92966430cafb09b37e3ba5bc80b5b3759f037a9001e390dba663e66f8c8d1b63038fa031fde7bd9ce2892 +EBUILD eselect-opengl-1.2.7.ebuild 1613 SHA256 ab46408a5fc63b1a812340b49f291aa1eb9cb84b7e4c55a2fa20efe9df599ef2 SHA512 c4f483abcaf9962e981f9a3ac38b9ad2635fb3696bc2a07e5a830b36e9ac7a5619af87a3c2b7dddddebfcfafc6dfe862aeab180b71a2189a7b55bb73499ee052 WHIRLPOOL b0d6b94ee3318aa5decb0eab23e82a4cb3ec2dfdf772f39c4778a2d5d9102947ee98aa390e9e4c0c0b47d91c088cacfc49f9a2fed6b290e1911a8a741286d233 +MISC ChangeLog 16911 SHA256 bdba5fb7d77161d156fe183e05645529d9d8210aea0f509ee0b975208cf7da72 SHA512 c4d6351fbcf09094415d4a84d1e5b412d1984b4358adf1dd0d6ff279bc0dcd80dda8f6a91b336a4d21b59e4bad5297c69059a06edad528c4592c558fd9241a5b WHIRLPOOL e44c3f5896e48ccf3f68193497695bb086aa5f2ec8ffb1047e9f235696d5e478bff0bafba3367f539722878b311546232980601bd04fd89c877936cdf5f89850 MISC metadata.xml 259 SHA256 1f2cf0891ca37f4268a47e2eaa69108868aaef98f78c06d56f4ec9cdecad4dd5 SHA512 c7fe3f4a41209e3816dbe12206254ed37ade121f56e0385f4b3cb5d0b463f15b86e3e92ed09e41675b74200014a521d949c3e20c0046c7d6d357aea39235a229 WHIRLPOOL c4e8c2b7ae4e244b02891fac60eb137a84809578c76a1c05d25d8287bf8a2e7e5dfb6248e6b3b207cdcfc9744b4b460a6f8c7763c0a9da2fc8c8efdcb5530840 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlEtnkkACgkQ/ejvha5XGaOagQCgnXG3njpV4TQqkA8RiaVd4n++ -DxEAnibsxaMaBfCDOZ6EB0o5B6DrV1Sa -=F3Fb +iEYEAREIAAYFAlGeNDYACgkQVWmRsqeSphNSZgCeMMMRvo4oG3dbYaLpGvEqs+89 +gi4AnRzNdxjfjDkRSiL1q+BJ7F98BTSR +=R2wh -----END PGP SIGNATURE----- diff --git a/app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild b/app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild index 9a88c7019ea7..c49865efa3fc 100644 --- a/app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild +++ b/app-admin/eselect-opengl/eselect-opengl-1.2.7.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/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.2 2013/02/27 05:48:54 zmedico Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild,v 1.3 2013/05/23 15:22:29 jer Exp $ EAPI=4 @@ -22,7 +22,7 @@ SRC_URI="${MIRROR}/glext.h.${GLEXT}.xz LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" IUSE="" DEPEND="app-arch/xz-utils" diff --git a/app-benchmarks/siege/ChangeLog b/app-benchmarks/siege/ChangeLog index 12c1b331f7c9..6c17546e5f6f 100644 --- a/app-benchmarks/siege/ChangeLog +++ b/app-benchmarks/siege/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-benchmarks/siege # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.57 2013/05/10 05:37:04 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/ChangeLog,v 1.58 2013/05/23 05:55:50 patrick Exp $ + +*siege-3.0.1 (23 May 2013) + + 23 May 2013; Patrick Lauer +siege-3.0.1.ebuild: + Bump 10 May 2013; Patrick Lauer siege-3.0.0.ebuild: Whitespace diff --git a/app-benchmarks/siege/Manifest b/app-benchmarks/siege/Manifest index 29264965744f..e757fab138fb 100644 --- a/app-benchmarks/siege/Manifest +++ b/app-benchmarks/siege/Manifest @@ -7,10 +7,12 @@ DIST siege-2.67.tar.gz 524276 SHA256 0a65b0c4bc449dd262490faeb05f674ed8359d9971f DIST siege-2.70.tar.gz 484608 SHA256 3cb4bcb52a4bee9b35a6b487492c3a8eb20d911d76131e1283ca73ac5d75dd91 SHA512 bb6137240ce6a0948a8e7dbc58a2d776f6ceb3df00bd6221953fd9838bfb964948cb7d0cee41fb9d436c5c270025374afbdb65ed2659792d3ddc68c715acbf21 WHIRLPOOL 781fc9ae65eeb30a37a3f0fe54eb58a54304d1214a12677e75db76e94645ff43f114d830458e3908ba066491d9c49651165b1580cce39ab0fcfefd0ccf5d8c6f DIST siege-2.72.tar.gz 486018 SHA256 3d43026859550987f0284431997516ede8061a75e7b1e844816f6a61e033c12e SHA512 831e3eeded85823b5c0e1a54db2b1c91f94a4900e309d3797a827a44f861fe7cb8ab617c33d1008de35f066a3f3ff72a0bb3900a79a47846a8acd61887b0d563 WHIRLPOOL db755f965794b99bb6b487fa7c5e21cd0f57993d76b10ef90a8537d5c61b5b44d19632b1fb0299622354ac2c438d28e261f02f1ed17ce34a6f53137a3104cf59 DIST siege-3.0.0.tar.gz 495571 SHA256 01e68e839305ec2b604d915fc3185b18dfaac69b692815fd6a2453e387976a7a SHA512 74c37747526b4d091c7bb7d1ad358a171661fc60e0032e193e7869ca88d484a3d6a2b77828e295a2c9a058594a57d0b59d5ef068a2c5592fc10326b80e494a6e WHIRLPOOL 228966daf9106d3997393a448d3d64f42621593e832c66e4a922c0b8a0f646648c30697f77f6f27cba2677d4160f6b99d18cd2b211901a9bf05797a3b8b9e187 +DIST siege-3.0.1.tar.gz 497205 SHA256 755634af407cdb4072ce6a1e9341083343c761879535e6ece7c45945a3dde350 SHA512 10c5bd8f70e0fc704c05b3f914fa2c24db5125d1e42e3e368f6c42f5d7d2e1f43fc77550de7d93a167ccfe00d90893d2399f5f7d5c5a4b9bb5fb603b5e11e8ba WHIRLPOOL 8aec1bffadfa2c2400d33774fc5df7b7c9985fefe1ba1497257925f27c3cca02570572ddccbbc0f1ecc95bde4ddfc4fd5ef735593e383b38229abc2faeaaca98 EBUILD siege-2.66.ebuild 1775 SHA256 8c3871f0007e89ea0dbc5c3140752710352fb0de8d84020593604eee9af29082 SHA512 92d40c644641dbdc22a838082aa8a17e0e2d32d0094ee0cadfb25be5c70381b13fc462915d0fc3c0ac2ab0781e026da64ca0e21be2f6fdfffba7a21483bd9f77 WHIRLPOOL 39fc5295aca0005555e20fd230e6219ee3a09b146cb8f87172472de9d027175aa9987edcc1c446cfe244b105cfd802e7c52845f77c66cc65369d69738a71bda6 EBUILD siege-2.67.ebuild 2148 SHA256 330f32a94058e172adf4ef8a8369c94db20f40adf29c7624faa10b9d90bd0159 SHA512 a4c873316d008f7565b27f0ae00dc143faf7f92723c90e4cc17393ff4bdfda798ab66dacd492a218da9f330eb96f1c48b7d15c41cf01f2eb4b6f7264f99e7b1b WHIRLPOOL 0ce722b5c9d818bea81d3c7774b6b28c69255ad2c954ab380cf3aadc1570cd400de65747126d251f92f42a51818309aa201e7737f89d46b268118b0fd9fb2024 EBUILD siege-2.70.ebuild 1213 SHA256 dc6ff2f7bfbabe81ceff7bd6bdaee06306e10dce1cc23f20ee15b524e59f522d SHA512 c6cd6538dda557eba37a0d3fb448154433422041a3309d6e598502b110433b3ba340f8e399d1fac24049ffee3773a0072aded69fd54b13798fa139edbb8e0833 WHIRLPOOL dc36f4d1a3a8bcce1a85838a385f04aeab52fba5397db2297ce8734826c44aa6717bffab5788fa700f781ae540988f0a1b8d1e817be0a183c27c2bd497920652 EBUILD siege-2.72.ebuild 1208 SHA256 21f51831db1b7f6873541dbf50d21637a328b77ad1dcca2bde48f4b74b01efcb SHA512 133a1b14da88f9b92e8735c13da1553254eca9016e6963d6e337c29399537e2f0d83713eb77c6be206614a98328a805f5260df92a23e26f6f1d933b60e712bc8 WHIRLPOOL 9b13c34193404f62c1bdcabe03e92f13d8cb8f030a872c5df11113da00c53aa286f5e4008c2fdb903cf8e97c1f43d76e4e7a95a747545fd1aa1c85381af6d1a0 EBUILD siege-3.0.0.ebuild 1225 SHA256 5c7a4717cbed9853ca92721797bea5cdcc662677461e2487c89735ee9a4c615f SHA512 720477d754d8dcc74ffa002534178828524f5efd31ca04935dd80b500e599823cb7457f7f2d17c6f5f0c40cb2383c17f9490775fef1b08a70a05c6eea5d1617b WHIRLPOOL e726d4731ade521b81ba0fed24c778d7a00f4510f258f7d8fb4959d4a632b35a1f8de2bba3b55d6b9a55697cd723dde61164cf16cdc3f249f839ac92e266f1cf -MISC ChangeLog 7111 SHA256 939fc8d12bd6ae58b311bf0bcb4a7e0fd5cdb070f30f63cedd89dfed0f9651b7 SHA512 7d078684e1e086a85f7414eacb25f05050f86f917c8f89f576f95cc52ff26c72047e83b280fd3fb6963680f0c11591a823cb475d8474eb5400cc84a7dab50cfc WHIRLPOOL fedee2fd53449b4f00516257d26993fc83262911234bac3170f89bcd19262315bb05ece5ec9afbd277633ca98f9f78e8700612b870a130672402c511feb2e57e +EBUILD siege-3.0.1.ebuild 1225 SHA256 1ed5b339a82a946ff89f87176a1a92694ae61c37bf2bf335faa2cfdc5f976b9d SHA512 c4e1f5ab45b7eeb3b7e992136306233dedf4b677425a0f596864aa31a584f41cae99d143eb7ded57b3debe744216805cdd99e25d9853488a2b54fb40329c4110 WHIRLPOOL 0ef90de83e9ff447588450162024a1c827a3f7d8bcb87054e90983fadd4c09ba398ecdc898643ed6e83cde013d2b5562e834c925948d0329f60e6affb3bedebe +MISC ChangeLog 7218 SHA256 af7405ea444f46bb4658e9156f1176cc02f00e4c6b690dec11ccfe64dbdff95c SHA512 d6ec4d59f1639e2f1b034065a1e6416f7691c96e07ffb9a6fc8260b5279854d58cb2c40d53d23445fed74b27d78647f69f1283be7edfe3fba242e6dbac152e6e WHIRLPOOL f4cfd1cf3a97432957bb511cf1b1463bc352fdc6b18d8bb38ae9042bdabe5ae74706b344471282a9ef935f628f4ef229a87bf0e27d6d9691d14213e9623007b6 MISC metadata.xml 164 SHA256 d1c053798bce14287e6955dac28fa5fc6c7415449545b2922f4d30fe4d84894c SHA512 a6a94663f191b6f40b376d4c5a662f175822231aee7acaddbdb43d521d6df75180245c962ee55d8cc585aa57bbe37cf90291b1ac777bd18146a0510877711c1c WHIRLPOOL 4edd8ef824db45c3717914b2e5f9e856b578a37fdcb34f5fb5a2c053c0262d32a855828a182cc7733e58b12dd6386b26f6a21fca652ac991e73addd45ce021e9 diff --git a/app-benchmarks/siege/siege-3.0.1.ebuild b/app-benchmarks/siege/siege-3.0.1.ebuild new file mode 100644 index 000000000000..a371b2acd548 --- /dev/null +++ b/app-benchmarks/siege/siege-3.0.1.ebuild @@ -0,0 +1,50 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-benchmarks/siege/siege-3.0.1.ebuild,v 1.1 2013/05/23 05:55:50 patrick Exp $ + +EAPI=4 + +#WANT_AUTOMAKE=1.9 + +inherit eutils bash-completion-r1 libtool autotools + +DESCRIPTION="A HTTP regression testing and benchmarking utility" +HOMEPAGE="http://www.joedog.org/JoeDog/Siege" +SRC_URI="http://www.joedog.org/pub/siege/${P}.tar.gz" + +LICENSE="GPL-2" +KEYWORDS="~amd64 ~hppa ~mips ~ppc ~x86" +SLOT="0" +IUSE="ssl" + +RDEPEND="ssl? ( >=dev-libs/openssl-0.9.6d )" +DEPEND="${RDEPEND} + sys-devel/libtool" + +src_prepare() { + # bundled macros break recent libtool + sed -i -e 's/AC_PROG_SHELL//' configure.ac || die + rm *.m4 || die "failed to remove bundled macros" + eautoreconf +} + +src_configure() { + local myconf + use ssl && myconf="--with-ssl=/usr" || myconf="--without-ssl" + econf ${myconf} +} + +src_install() { + make DESTDIR="${D}" install + + dodoc AUTHORS ChangeLog INSTALL MACHINES README* KNOWNBUGS \ + doc/siegerc doc/urls.txt + + newbashcomp "${FILESDIR}"/${PN}.bash-completion ${PN} +} + +pkg_postinst() { + echo + elog "An example ~/.siegerc file has been installed in" + elog "/usr/share/doc/${PF}/" +} diff --git a/app-emacs/evil/ChangeLog b/app-emacs/evil/ChangeLog index 6c296efa7a96..172819e876e0 100644 --- a/app-emacs/evil/ChangeLog +++ b/app-emacs/evil/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-emacs/evil # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emacs/evil/ChangeLog,v 1.1 2013/03/07 16:19:40 ulm Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emacs/evil/ChangeLog,v 1.2 2013/05/22 16:29:06 ulm Exp $ + +*evil-1.0.2 (22 May 2013) + + 22 May 2013; Ulrich Müller +evil-1.0.2.ebuild: + Version bump, bug 470886. *evil-1.0.1 (07 Mar 2013) diff --git a/app-emacs/evil/Manifest b/app-emacs/evil/Manifest index eeb296796ef8..6802b06ae1f4 100644 --- a/app-emacs/evil/Manifest +++ b/app-emacs/evil/Manifest @@ -3,20 +3,22 @@ Hash: SHA256 AUX 50evil-gentoo.el 99 SHA256 77889bf1ea4fc53c9e9df59a16382e13280e7ca05e095bd155df730af2d0a1ce SHA512 fb934f37d51412b59b8d5a7d27a7791d2db547bf1d71fd0a5b85bd31d24e2a663e92272095b6b2fe0cf44cac6ae69ed1a422b6b4ef0c6533e004018cfa6011b3 WHIRLPOOL a3382e2fba92407193aa96b55256a26d9a529c5461bc9cfcb215cbf595581000d2cf47952fda977b03d8c9984e66edb92bcbc22f45f48715cfec7941fbe3cfb3 DIST evil-1.0.1.tar.xz 427548 SHA256 359be8f8e43e1c9fbb8b97b37a3db806223793ee02635904ac98498a18aa9f88 SHA512 a521bfa9cde6f0a485121ccab6f2d9c0440de212f212d351697b3356168ad1d11be402e653a73c20100d4747d9218e7fd6a834ef00cb54b434e93e046b6490f8 WHIRLPOOL f4b975e2c0a55aeb47eebd702cb5e6bf0e0a0af4e8ab3cfec8024a843e19ef51969402ff9fbf6825898cdc39e22303b10182b21630a7d7912b42bd12fcf18da4 +DIST evil-1.0.2.tar.xz 427592 SHA256 aeb47184ae90772582232b12ac5aef1ec852c5484a135fe6c3ef3ce19518f0ea SHA512 5d30c6b4c515342c2f2e563b829ef2d155b37a011364993b5bd398960cd87b4707e92d99008b4d26b9dbef4aab8c17c0bf6fe695db4242c592c3e823dca7cda5 WHIRLPOOL 625fb046578f9a7bc2774147c20f441377a38c4de5659c8233678b3ddd2e1101dd6c866f4df6dee821b7cb7254e5099b439c17d9ed3efca0795876e84e2dba6e EBUILD evil-1.0.1.ebuild 604 SHA256 f08c219593cb3535c69922bc56db610512bb59418048dc92618317d3bb05e6d6 SHA512 ada7749132c73d0e4f5240bfa44bb9fee44ee3da56e484d3fd7deaa64a451b4b6b99cd0a8c59bf7dbe44eaffd0099b6d1bc23243d7e02963d85000b8818a394a WHIRLPOOL 7119f0a392179f82fe27fc0e7b8c78bb88d8073c45af48f22982b36b1d23d0671c0d51375a250afb302bd4ab6e94f45a1350439034ebfb821b89893ac5c09bda -MISC ChangeLog 473 SHA256 c5386634369b98f4d1823f2745ab5d597ba78c0dcb0d0413cccc3633c4d6f1e0 SHA512 62e25702a1b491c3504cc64021e981e4f17785bb5c3444f3a44f8a47e10e2d90ba188ebbc58022bc58b3cb4e6150e3fe06a7661440b9985cd545466228640fcf WHIRLPOOL 9460317008598ce01869a37969bbb8e0e89eb09b1b7586764731e834cb3717afba06e1c1ba09c86a1ef0a527bcc856e6eaec04c31c208736ef38aebf8ef35931 +EBUILD evil-1.0.2.ebuild 604 SHA256 957e5e191ef5e628d079050fb1768f74020ffd4c6494d30aaf55925b37d6a9e0 SHA512 8332d796237bf2ead82092229659b6414f1ab6e276133a699cb7e494b0ed5b38df8ac6f03ec71c9e963ba1978c7c1a7470f2a04aa2c8a2bb3b8e068587248b0b WHIRLPOOL 777f145427e4c79c957a1789632e235b9d741228d649c1b38a8b25e8481415f7fe2166ce926a19e0d283d00bea6530fb12ccbaa4f17b4699d8cf7bfa22a8a498 +MISC ChangeLog 596 SHA256 01f641c223a9d8d4f722e9ebee1c9c1f5aae00ae560426717b42735ff78f8563 SHA512 50b46585d90ef325cb1209a70484849704e7897c77f3fce7413f1343e74d54b0c157bf7ba1fab564ab9b9600ac33182bb7576590af73d667da9c16463b1f91e4 WHIRLPOOL a75d328104d9acf8da3d82ac0bc366689437818f46542b4c69804cea6a908a325a1cfdb9eac8d066122fb036a5fb0656dfb6a6b17b65450a9f43f512585cc645 MISC metadata.xml 158 SHA256 1393bdef3a74343fdb40a112c7096a1af16f67e7a43413250de28dfe73810eab SHA512 e55d75feae933ba948ae987305ea58e36f5880f18687e8acaf91237e33e251be3ecfd5be27048f4907ea6799e0bcf784b602096dd7e2bc9c450eb5e2bb6a73d2 WHIRLPOOL 1d1676172186235a3e99ca1d148298fb24f6a089f9b7908b3c28c246c8854969835fd3742b8b81e0a30b63d76ee0be0c42bfede2416a30dfc3c8b915a147340c -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQGcBAEBCAAGBQJROL9GAAoJEJQzkH1pP7W4nrIL/3wQXpCPuvfn1tDZjH7kcUqV -yrv3GFJA4A47bdIg/DAZgG94uaOSnqXFTyRnr06dUz+YXWLdaVKrDbFcUXKAcvQC -U6IF2HjotFSNzoJTWY6oBYskvAMP6zH3XYExCl3dXBOIhKnezmwFTZW4bZayPzdN -p7YBchgekTVPU/L+ED9kUdR25ziNo7VC4XIevQGHy927JxLPy7hOf1WE9C+Bip8E -8bpUAqKcCaIeoZy/W0AlmxwLdO90UcrZH6djwG+BUlW0CJw+PLMw2TfmEUnODj1e -FrmjDgWupd10gb9RLiqRSZ13pMYTGiXsqH9gko2wwWauw8nh++vjPrdW+O1cIHMy -wSz9rYENlEjpwpqtERGUAX5WuUqrTyqE5EEBy1I+Zx9Z9dBO2POCD59CKqSvPEBK -Oq9liytbVnzyHDDsTitHy1n5Qm753rkMERozbJfpqBfoTn5bVfnAde4TzqCikiQU -ODGJ3AiHRKs5Wd5G9M1/pEyJInLsnyhP7WQXmE887w== -=d065 +iQGcBAEBCAAGBQJRnPQiAAoJEJQzkH1pP7W4ml0L+wVqm0LrCRXXLTfuvE1xfni+ +5Kk661ZXUIzN1CTuFGvSkPkNHf3gElRDw8mZ9BSiooKDkZeX/86SCRQKn1ZA0oWP +OMV/Bjb5mXWkntYDi2udX86JgTRnnjr0R8cFmhOtPW/y+O2gQMofX6KLE41iS5AM +GEmVrFvsWSVShW4XaV12Joto1w3o7qehK+ZTwIQIdwXvkxeORMlNTqA/jcLylejU +jzHF6A8tzjeuUU6NJ8LQEoE+3EX4pcsOfp7lLK80ZwKQip9AF87NBRgQwcymUeVJ +PoYe8xBWlvNIByWcvrNVjtuVm1qSOLQofavtwk3L3+2kJcGO0pWffTghJnaYELBI +i6AiBLZJK5+bpkraZ2DdSjZF57LfDkY/vB7qnkPbPx40zBlg8cVzjdfG5QxrKcuE +KwxvCw0KGqbO/exk5kVeV0axgLKlCOu7gAcSUALqJktv6JdpaadQ0BdukpO0ZCwN +keKP1Rs9cMVequy1l0UZBUxJvjB1IJLPiGKe000e+w== +=7MFL -----END PGP SIGNATURE----- diff --git a/app-emacs/evil/evil-1.0.2.ebuild b/app-emacs/evil/evil-1.0.2.ebuild new file mode 100644 index 000000000000..117f1a48dfcb --- /dev/null +++ b/app-emacs/evil/evil-1.0.2.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-emacs/evil/evil-1.0.2.ebuild,v 1.1 2013/05/22 16:29:06 ulm Exp $ + +EAPI=5 + +inherit elisp + +DESCRIPTION="Extensible vi layer for Emacs" +HOMEPAGE="http://gitorious.org/evil" +SRC_URI="mirror://gentoo/${P}.tar.xz" + +LICENSE="GPL-3+ FDL-1.3+" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +DEPEND="app-emacs/undo-tree" +RDEPEND="${DEPEND}" + +S="${WORKDIR}/${PN}" +ELISP_REMOVE="evil-pkg.el evil-tests.el" +ELISP_TEXINFO="doc/evil.texi" +SITEFILE="50${PN}-gentoo.el" +DOCS="CHANGES.org" diff --git a/app-emulation/libvirt/ChangeLog b/app-emulation/libvirt/ChangeLog index 1c6a37768584..11b2c55616ef 100644 --- a/app-emulation/libvirt/ChangeLog +++ b/app-emulation/libvirt/ChangeLog @@ -1,6 +1,13 @@ # 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.270 2013/05/21 23:56:31 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/ChangeLog,v 1.271 2013/05/22 15:56:22 cardoe Exp $ + + 22 May 2013; Doug Goldstein + -files/libvirt-1.0.5-sanitytest.py, -files/libvirtd.init-r10, + -libvirt-1.0.0.ebuild, -libvirt-1.0.3-r1.ebuild, -libvirt-1.0.5.ebuild, + libvirt-1.0.3-r2.ebuild, libvirt-1.0.4.ebuild, libvirt-1.0.5.1.ebuild, + libvirt-9999.ebuild: + More fixes to LXC's kernel requirements. Remove older versions. 21 May 2013; Doug Goldstein libvirt-1.0.0.ebuild, libvirt-1.0.2-r2.ebuild, libvirt-1.0.3-r1.ebuild, libvirt-1.0.3-r2.ebuild, diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest index 1c2ba932d1d6..7f0d6b1a6f87 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,39 +1,31 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -AUX libvirt-1.0.5-sanitytest.py 917 SHA256 779ace1f9afe0c236545db8b939151b3be8efd942f385f89ce3461c2840726a8 SHA512 0560ff3782f75995af79354c049e2ce26a879acde0fea3f451c26eca9a0cf08084b32e6c4e042c2f91e34a0f5bb7e5ff7c89881febc6c44ec63e32b2f5cd313b WHIRLPOOL 03eaa4da6cea915144bf95d36730d8f8ee38ec8cac815cc5e106b853ea15f86687327f25e577ae2621ab291d2d00fe5f085b1decd889ad6745fee9149af456ed AUX libvirtd.confd-r4 2015 SHA256 c2ca5d9a2d4ed433e91bd215c2ca678109cc981072897a497955e36760dc3b9f SHA512 b3e1d2433be7838a35386747422a8f98f2a7f6a92a03089f9472eb8ee2efb7d10d2becd363fea7cdaf8771da31b58cd60d192b25e089b6257ad5341b1074e540 WHIRLPOOL 284e72e704b759433d5ddc1a3e4019164dda6b48cb2734ea9a6780747938bba2855a99dcf1b125ab3f500a6145315cafa4a3531ff6938c0c62e5b1a6f99ea9b3 -AUX libvirtd.init-r10 3636 SHA256 8912375fc1d5e031b207074e4675f4d54a8684ba261b89cfff5491f430982641 SHA512 0a23c30e5766d32fd9d3f51053ad4a3c981b7b62281ddb2a9afc59f78ade0a1521504ad01f4cc233a66afcbd94c91b7ca341b9747e4a7bc13d61e0be235efa84 WHIRLPOOL de6cfb3637e0114978bb3492d03f2b3cd487723863cfbe086d4c3c2c2bd875f8e242338c31e610094f74867db84439c07dfad508184c798839fd0d0989a56fc1 AUX libvirtd.init-r11 3656 SHA256 51c3b79c1a71638211056f11085936d40874c5eb1440512309a5c0837f5a59e1 SHA512 c1743271fcf18eef38d9202ca58c7d052159262cb75283ce13739f6a21f3c6024cac567f52f082744c8f4321b857ace4489cc363281a7757920dc306b618d27f WHIRLPOOL 827f3908c5580e526ba83efd005c72d5024ed04072aab00e372347315d9cb6be88512c9148b5283d01190c2ef2ffa4fec477c28299afe70414c76188258103b2 -DIST libvirt-1.0.0.tar.gz 21868950 SHA256 14c8a30ebfb939c82cab5f759a95d09646b43b4210e45490e92459ae65123076 SHA512 b4c3c34b2813f08653b33de5e1ebf030f2eafe77cb6107724494b83643a4e744b3f2c290a1755bcc586c8c7ebe0d8955540d3455736685484e27b07f677dca2c WHIRLPOOL 398af483a630294d7306f2cef95712613a0391da19bd654f5b24aff54d99df8940f79e560a61b3e978f3a62b89778a1b3e6a171188b9a8c42e31e2029a93f3d0 DIST libvirt-1.0.2-1b2f2439.tar.xz 3184 SHA256 fb7cbd3add0b54927b1be4bc753e0f0279e11f5b85bb692d44fb9b99b85722da SHA512 a45cd0896dbf845472135cb3548eff731f6a6c89af2d90c44094d3c07a8f19c8c8422dc43228a0c4b0c04b1b11bae2bc2a271f02bea598d36b52c42fb60ddc19 WHIRLPOOL bf0760fcf5245d0c3347f1969605fcb3df86c93e183b468c0421b88801db5f0984c4d1ce5a3ebc7b72a53f585d17db7fa984f7fbfa6e8f1d2c65819f3fd3ed27 DIST libvirt-1.0.2.tar.gz 22971729 SHA256 9b8c2752f78658b65ef1c608b3775be0978d60855a9b5e2778f79c113201c179 SHA512 c35b6dc46594a93d4d633ad42df2cf1da7cbbf7327205ba4c608d4f95f0017cb4041518c3dafa3d5ab7dadaafad116779415c843e0d4e67ef1df31bd9a9295e7 WHIRLPOOL cf56954392f263fe686c79e320f238cc657424512bf3b136bd68747777640cd564affc38f7ed077a1e00f2d2511ab607b236a9b6ea4fbc8f089a2a0267b214ce -DIST libvirt-1.0.3-2102e03d.tar.xz 4180 SHA256 a66e7b5f60461d203caa7fc38237d1742c6e550e9d8baa8835ea7df584cb70c0 SHA512 55c7c7fe7285ff399d2b13756653ebfe9a7e9e21ce2e9b91a366a7867ef10ffac9846dcf72af2941abd996efb9d115982f980abc88d1c629f0833c5e20f1f692 WHIRLPOOL 644ff645393367c69c97d19c73bc2e0e8eac8a219f67041ae0c44069a760e03527f77d41c7d37c2483896bfe4439f450fe35af64f6316fa634d947665f105149 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.4.tar.gz 23353253 SHA256 d94c99ce286f5a89eb02c9f3d9d620930df1f9348262a60199b4a565a222c9a0 SHA512 5e867e48c12180840fcdfebb85e7349b704ae923cdb188d41009788d39ff64c25483e608805ccb0e91eee164c8c6e89ac08643649e495ad04668a11f7aa5a8f6 WHIRLPOOL cb44708897b485a5a63b2ae107d869c9deb09cbbb9288c32ee73cb513a6e895cf4ceae948719e449cf2f5eeed4b490e7c421dc2ea3bcec865a946a56f0a01e15 DIST libvirt-1.0.5.1.tar.gz 23928327 SHA256 38a67d9dc979ed28440791eb3fd63e94e4d04e4efbe7554a83bdf0cc614d0a6e SHA512 8cc3850dcda93b2d4efcd055a91ca9f2a619ccb9585e5b9fd7e2daf6ee8e93c1a0354fbc7fa06f6d5663913f358c2fbd9569a5e307b90e91607b0e049f00c89d WHIRLPOOL 51298d87cddee79f352609306c77d3f1813684c931b11ea577d96560e366b112dfc625553a86fe21c291d7e9bba86024055b236029be56c3c6390cde49875e8b -DIST libvirt-1.0.5.tar.gz 23928547 SHA256 337f1cd6611462b6e3cdf94541c49477df678074321fb7923274e4e30398209f SHA512 ee069f6047bad26b59cc14f7811725801d96525e7943e7abc31d33d256c77ae6024cf5ff841af9441a6853a3c24ba6aa5e0f437dcf2c5b2cfe860364b01719fc WHIRLPOOL d26107a400711dad468bfcb28cd88e0e7269a7cc7edbb487ed43b6ced22219d5e317af790ae69dc92e514cf29d68c88c8c7f18439679c142bf51d549d8cff8b7 -EBUILD libvirt-1.0.0.ebuild 11523 SHA256 fcb8c833a2a5477c2e938ac860c5bb039fe1b8f25f290f33ad38b6e5c898751c SHA512 2dd9d9f7c0b4e33ed3fb79dfb73f5ae529cc9556809b25ffc97b3bd44f7c3486bca4efdf02f3156843041197b11e63a6fd2d19ac394d8a2e827432d92b075114 WHIRLPOOL a4912a80bd8ae8e3cf0ea14c732f12590233522b957787082b84c632b8cd4fdd8c10dfd700f232ee83cc681a725cec7ec9e22a59c5a1be09288db0e35357b034 EBUILD libvirt-1.0.2-r2.ebuild 11853 SHA256 cfff47a9f5bd41edfb2db44755800c42576a0e6f378fa8b3cdbf0f120d0a7ec2 SHA512 c4dcaefb32a9be93e5c7836db45332645a5fb1b4aa96f338dd417552e450e896f6334887001cab591c6d9efe0bea6fc4ddb573d21cfc6ff686c91f02fe1cd290 WHIRLPOOL c6857ac5588ef3aea6bffe4df5ed254f4941d9e647642bf23575d6cd3357250d0c2e9ac4a40fb17a25a390b71604fb7671a8fe7ab619559e7f24552165722a6e -EBUILD libvirt-1.0.3-r1.ebuild 11855 SHA256 44219a81ba592734d909fdb228f179b07a3bb0eb0b02ff56eff14e315679e386 SHA512 567f8f4a112343e03e9936013d2861c6bfe4ec53ec32ccdaab0452572629fd62f498f7da919232d4ff2440dc419d275c98c40bf6170971d66c3cebb271009e3d WHIRLPOOL 2877304985997a99c0bed657edc487f998b3818e6113c90ab746dd987df00b7f978b68f503e310119d711dd83a8cd8c9906d4edfaf8d35751ffc504a2635c39f -EBUILD libvirt-1.0.3-r2.ebuild 11955 SHA256 0cac6d154781981a1cb4fd22989d7b067fe469dbb5c3791cd1f5aa1861015038 SHA512 6ae6c503462ce19036a1ca8ccffeabc0a349f150167c9fee9fa2166abb3cba1f9d2180391c66bb39ef520a9dd38e078048d406f94028e79d622af5142b64abf2 WHIRLPOOL f660895f4c5b6c8de1351346a6d3b40e90f673b0d1f8d41d60b06e71643fb7fd1e862753df2fbe00ded32fc3f26fc15331017275faf676925d1e26b048984e4a -EBUILD libvirt-1.0.4.ebuild 11955 SHA256 4997935bfa2473a82086cfd173a8557b526209ab225adc377a996e71f56ddead SHA512 a3109fc78473965c7b0f1ef18bb8e72f85f4ee3145a90179944c28e2d0e95549a598c5794093d8e0712c719d21879e96a727c5abc599020ceb24c0f8f7f8b868 WHIRLPOOL 1439a8395a875c5999e97441eadb64df66dc513c70be2ac4e9cb37ca6772f9857f9897d5a1e878063a354e30cec7f668ceeb24944e9155c7afbade3a36db1fed -EBUILD libvirt-1.0.5.1.ebuild 12137 SHA256 870837b4d6a33154ad1bcd8eea26263512513fa4faff7c92a6b600d400fb2d7b SHA512 df3eceb70da7a4b7df500b6e27a935f3372c75fd482f5a5ea08492d7e19959b98cd7eea4c77607e603a828255b4568386d2ff0cb819c329457592fa8b6f160a0 WHIRLPOOL d7aad44959b67796e71997e192f7ee5ddcaea53f2dc9bc5510be28958570ff5366f3bf2cdf4f38039601f65c8f933cb2f34e49ac6b8b6f840e82215b070b0ceb -EBUILD libvirt-1.0.5.ebuild 12051 SHA256 1e08959751c9e46afa38ff901cc8e01862e034631ba5403abdeac5bcd1350746 SHA512 8e9c3d743d1d4b79e17360757ac6d346a6b0da09e0e4902808a8e17676ee06d1016f7453362aede348fe3cfac565290bbbadc5e05088331f1dbd08796e9a9506 WHIRLPOOL c8320ce9b2686176b1d0692a166e2c3297b7a4497da8180d56248363afad5b482634069ac95b553d584c298630eeedf7bba8c3f31b05c4cb3ffb8826116fa160 -EBUILD libvirt-9999.ebuild 12057 SHA256 855e788f7f52afcd47c5d621af4919f9ba420386d65ca934924feca27d0d7a8b SHA512 f4b95251c6f5aee94d259cb92e1e687963f20a9ffd438781f5b81931d43b4bee2d15f916231588f36413321b7ac6b29854c433da50a57a240ec4de1587d3b535 WHIRLPOOL 58d0d87828172b3e6b07c7f6bc6b06e456351a6f0c0d4f9f92e2243aaed0130c94d402a248eed353af9272e15d65550cade5ce06fe668405b9f052e75a81c71a -MISC ChangeLog 3337 SHA256 fccffa8f00b864a8a7150b7367a618108ad71dbacd814bd2e07775078c74b100 SHA512 7988efb7ba1da64cc569c547bea6649f48caa06d4ce3e986ccaf8032ae648c65f469ed6a346aa79518eed97ec123757d4d3ad5135d7953c4e5e8a9b6bfad75bb WHIRLPOOL 8184bf69f33fb69d06dc4ca5d05adef422be99d766fe4243908da46dbf26e3afb57fe9f07dd17f2789125c1995d978901f1ae5c1a1a5caa30ecdaee08956b05e +EBUILD libvirt-1.0.3-r2.ebuild 12003 SHA256 9487bfd65d6c0f959c0932d78a3852906283473e2cea81c6f481a291e01e19f8 SHA512 e330564b03751f950da2a83a1018f857631231b27b7976d379ee1bfc44bf6e5929c08a1f69f3a4fde7ccf92f25a90a25e720c6ad6c9ec6efa15c27a8a6cf6814 WHIRLPOOL 9ee7c51da91107e99247e0d1eb0bf4d22110fc43cdb5c47b749e5d2a2226c882ce9d5c5b0a5761ce01ac1344ce7d375670e6935ce760c47766f042c96e3247d6 +EBUILD libvirt-1.0.4.ebuild 12003 SHA256 cf78e7e1b6d2a649f5bc9809aad9f1deda023acd06df7d1143a6d5fd0425d669 SHA512 be893f168ab1bb1fa283dd1bbab059638f4ab5e3957958a6b285f438389152df2041a4d8c5bdc17dc2f53ce46449e0a28be6666dd8ba0a41b507ae2e2a3ff41a WHIRLPOOL a527fdcb016734fbf005dc674ef0515462b7d6f41f4755bfe90ee297bcab1e9405b6d3a081c270917a57b8c91618ba2082adf7de7377c6594025f5a339aa11f1 +EBUILD libvirt-1.0.5.1.ebuild 12185 SHA256 b6b73181ff46a0d2359327d979a96f7165a56efcac0ab6ab11da0b4bc8f39b65 SHA512 1390fbaff78154cbc240b946bbb043b73079c2bdd4275d55de3a0b2364e3eb635949d109abaf1021aef0fb12a088459cf21cf7774e31cd9e6ac8d958fb6664b7 WHIRLPOOL c23a5c56c59f18919cd6841db305b15303512db69f356cf7ab4bf6f41e3efaf3355ea5f74dd5b9e6091043256500f0a9b7464abd5a87b266a01c457901659f7c +EBUILD libvirt-9999.ebuild 12105 SHA256 feaa2fae6c1cd35f1d834267189fd2ed8a83a8b83eb356d45f8983722eb50202 SHA512 ce7a32702484cc33c07754c031b9fcd633dac29b7efb430ce02e36294809d821e13146c75ad9e6d622cf673392de87c2f18f426111efea97fd9f62a9346c3363 WHIRLPOOL 5ad7f14c98c5419c67e3ed0e2cc6a26b8e2efc228f1d84468f0748e933cd531b8aa2397c67518dfb6a49ef5941120e830b275212521c8cfa9958db58f8e530c0 +MISC ChangeLog 3688 SHA256 4e6138509feda72aae7ff9d1c1e5559a127dfd87956702c556f812369cee7acc SHA512 613a7b9f00b5c425b2c152cf54c6aef3808a89f737e5827881a05530e701db16894dd566fe211c2289404dd7c4fd6d16b0f4a75c6107ff024ed2385571c6275f WHIRLPOOL 87925119e628132d9afde45fc70d66cce68492c9baa75db79f9b275acb26f1da010b5499bb1d3b3d8215ba3c18d3a9fbdd59599a7a3a1ac60f0d3b3f9eebf37a MISC metadata.xml 3518 SHA256 b4d7597acd9441b02afd05f1f4d51522f657f9ecafc9a77c66e1633b4991ee8a SHA512 f5fbd24db303d44b0801d5ea78815c169a668d090e039450979b495e00a852a8fbc8bf3bd65534cfcdb7540834af3f1496ce2a9abf449e39f83975b6892a6d87 WHIRLPOOL 086aa2e815bc5bb2ad8a0c54b6d1522e40b5c60662839c5792f7f96e03af9f5706a195f2c940ed82d04267ed8c0d40838326fb714848be006fac8982ecd80485 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQF8BAEBCABmBQJRnAm7XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w +iQF8BAEBCABmBQJRnOqzXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRDMDRGNEJFMDZEQTJGRUY3NkI4MEM3NTlE -N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prv5sAH/AiepmTnZxuPO69KiD6spOnq -GC65dvz2iLBB1JbsxZntlqiNGHhWj/5zi0aOZ+VpoqZpo1QYwImejzs/G/2iAdYp -MafL8QTtLFliAdst1n3A9zmHRb+W/1AAfcGnGvNUgjbYLqKNyJlMKFkkbVSP4+Fk -oF88hprA9ippsFy8eqBV0Nt6NRlnmFLdnwceszxme9WYTYAmWgngRvvP2hX/nkV1 -NEY5o5bv7GS1XiKq2fTfHq9d7orwEqlwLgaRUb9sH1NtvdWXGTQGJzQkuOgLKz4K -VHr1w7ZF4zRBArvEnuNlFUU7FZTRPi+pVYcVt3MRR+0Mr2Hpzh89IQZT7X3YkR8= -=YaQe +N0RGQThEMzE4RkE5QUVGAAoJENffqNMY+prvFSEH/jMBlzQX73t/WFEH6/P94aW6 +NT2x8JYKlGy2YCqu4GIuCI0bhhgUrqMGTadXe1oUs3pnzUHeii01MdQLwUbRlX2d +Oe9x2WRABCqe7HrSJmZ9DZ2n30uloknKhlUlxRe1p52IPgS5a0bi4n4S/Y7NHh01 +LmoqDlUgW8RsTH6N8vnNm9MyKw7tzshupa8jTZIUmZLedfDeyUpMS5w1HXKEqsxr +wa+GGZ0CaA6VW75tkwn7XaIev9GYjcOWjaUtEKNBkf1/ll8vVL+0HDoLbbfbpRxT +Gvd9eSYU9gLgnQ4pP53UERneApbDSu5DtMYt67EkZHR5mbbOTzQq8n+LA1zqkZg= +=Z2ko -----END PGP SIGNATURE----- diff --git a/app-emulation/libvirt/files/libvirt-1.0.5-sanitytest.py b/app-emulation/libvirt/files/libvirt-1.0.5-sanitytest.py deleted file mode 100644 index ace67929ac36..000000000000 --- a/app-emulation/libvirt/files/libvirt-1.0.5-sanitytest.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/python - -import libvirt - -globals = dir(libvirt) - -# Sanity test that the generator hasn't gone wrong - -# Look for core classes -for clsname in ["virConnect", - "virDomain", - "virDomainSnapshot", - "virInterface", - "virNWFilter", - "virNodeDevice", - "virNetwork", - "virSecret", - "virStoragePool", - "virStorageVol", - "virStream", - ]: - assert(clsname in globals) - assert(object in getattr(libvirt, clsname).__bases__) - -# Constants -assert("VIR_CONNECT_RO" in globals) - -# Error related bits -assert("libvirtError" in globals) -assert("VIR_ERR_AUTH_FAILED" in globals) -assert("virGetLastError" in globals) - -# Some misc methods -assert("virInitialize" in globals) -assert("virEventAddHandle" in globals) -assert("virEventRegisterDefaultImpl" in globals) diff --git a/app-emulation/libvirt/files/libvirtd.init-r10 b/app-emulation/libvirt/files/libvirtd.init-r10 deleted file mode 100644 index 0e1157049464..000000000000 --- a/app-emulation/libvirt/files/libvirtd.init-r10 +++ /dev/null @@ -1,128 +0,0 @@ -#!/sbin/runscript - -description="Virtual Machine Management daemon (libvirt)" -extra_started_commands="reload halt" -description_halt="Stops the libvirt daemon without stopping your VMs" -description_reload="Restarts the libvirt daemon without stopping your VMs" - -depend() { - use USE_FLAG_AVAHI USE_FLAG_ISCSI USE_FLAG_RBD dbus - after ntp-client ntpd nfs nfsmount portmap rpc.statd iptables ip6tables ebtables corosync sanlock cgconfig -} - -libvirtd_virsh() { - local mode=$1 - shift - - # Silence errors because virsh always throws an error about - # not finding the hypervisor version when connecting to libvirtd - LC_ALL=C virsh -c ${mode}:///system "$@" 2>/dev/null -} - -libvirtd_dom_list() { - # Make sure that it wouldn't be confused if the domain name - # contains the word running. - libvirtd_virsh $1 list | awk '$3 == "running" { print $1 }' -} - -libvirtd_dom_count() { - # Make sure that it wouldn't be confused if the domain name - # contains the word running. - libvirtd_virsh $1 list | awk 'BEGIN { count = 0 } \ - $3 == "running" { count++ } \ - END { print count }' -} - -libvirtd_net_list() { - # The purpose of the awk is to avoid networks with 'active' in the name - libvirtd_virsh $1 net-list | awk '$2 == "active" { print $1 }' -} - -libvirtd_net_count() { - # The purpose of the awk is to avoid networks with 'active' in the name - libvirtd_virsh $1 net-list | awk 'BEGIN { count = 0 } \ - $2 == "active" { count++ } \ - END { print count }' -} - - -start() { - ebegin "Starting libvirtd" - start-stop-daemon --start \ - --env KRB5_KTNAME=/etc/libvirt/krb5.tab \ - --exec /usr/sbin/libvirtd -- -d ${LIBVIRTD_OPTS} - eend $? -} - -stop() { - local counter= - local vm_name= - local net_name= - local dom_id= - - ebegin "Stopping libvirtd" - # try to shutdown all (KVM/Qemu) domains - if [ "${LIBVIRTD_KVM_SHUTDOWN}" != "none" ] \ - && [ "$(libvirtd_dom_count qemu)" != "0" ] ; then - - einfo " Shutting down domain(s):" - for dom_id in $(libvirtd_dom_list qemu) ; do - vm_name="$(libvirtd_virsh qemu domname ${dom_id} | head -n 1)" - einfo " ${vm_name}" - libvirtd_virsh qemu ${LIBVIRTD_KVM_SHUTDOWN} ${dom_id} > /dev/null - done - - if [ -n "${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" ] ; then - counter="${LIBVIRTD_KVM_SHUTDOWN_MAXWAIT}" - else - counter=500 - fi - - if [ "${LIBVIRTD_KVM_SHUTDOWN}" = "shutdown" ]; then - einfo " Waiting ${counter} seconds while domains shutdown ..." - DOM_COUNT="$(libvirtd_dom_count qemu)" - while [ ${DOM_COUNT} -gt 0 ] && [ ${counter} -gt 0 ] ; do - DOM_COUNT="$(libvirtd_dom_count qemu)" - sleep 1 - counter=$((${counter} - 1)) - echo -n "." - done - fi - - if [ "$(libvirtd_dom_count qemu)" != "0" ] ; then - eerror " !!! Some guests are still running, stopping anyway" - fi - - fi - - if [ "${LIBVIRTD_KVM_NET_SHUTDOWN}" != "no" ] \ - && [ "$(libvirtd_net_count qemu)" != "0" ]; then - - einfo " Shutting down network(s):" - for net_name in $(libvirtd_net_list qemu); do - einfo " ${net_name}" - libvirtd_virsh qemu net-destroy ${net_name} > /dev/null - done - - if [ "$(libvirtd_net_count qemu)" != "0" ]; then - eerror " !!! Some networks are still active, stopping anyway" - fi - fi - - # Now actually stop the daemon - start-stop-daemon --stop --quiet --exec \ - /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid - eend $? -} - -halt() { - ebegin "Stopping libvirtd without shutting down your VMs" - start-stop-daemon --stop --quiet --exec \ - /usr/sbin/libvirtd --pidfile=/var/run/libvirtd.pid - eend $? -} - -reload() { - halt - start -} diff --git a/app-emulation/libvirt/libvirt-1.0.0.ebuild b/app-emulation/libvirt/libvirt-1.0.0.ebuild deleted file mode 100644 index f7dfb38972ae..000000000000 --- a/app-emulation/libvirt/libvirt-1.0.0.ebuild +++ /dev/null @@ -1,410 +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.0.ebuild,v 1.7 2013/05/21 23:56:31 cardoe Exp $ - -EAPI=4 - -#BACKPORTS=85e8c146 -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 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 ) - 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 .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="${myconf} $(use_with xen xenapi)" - myconf+=" --without-libxl" - 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)" - - # 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}"/etc/sysctl.d/libvirtd "${D}"/etc/sysctl.d/libvirtd.conf -} - -pkg_postinst() { - use python && python_mod_optimize libvirt.py - - # 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 -} diff --git a/app-emulation/libvirt/libvirt-1.0.3-r1.ebuild b/app-emulation/libvirt/libvirt-1.0.3-r1.ebuild deleted file mode 100644 index 7cf1b7b023f1..000000000000 --- a/app-emulation/libvirt/libvirt-1.0.3-r1.ebuild +++ /dev/null @@ -1,421 +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-r1.ebuild,v 1.3 2013/05/21 23:56:31 cardoe Exp $ - -EAPI=5 - -BACKPORTS=2102e03d -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 .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}"/etc/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 -} diff --git a/app-emulation/libvirt/libvirt-1.0.3-r2.ebuild b/app-emulation/libvirt/libvirt-1.0.3-r2.ebuild index 190dba1b3033..d74d290e48d4 100644 --- a/app-emulation/libvirt/libvirt-1.0.3-r2.ebuild +++ b/app-emulation/libvirt/libvirt-1.0.3-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/app-emulation/libvirt/libvirt-1.0.3-r2.ebuild,v 1.7 2013/05/21 23:56:31 cardoe Exp $ +# $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 @@ -115,11 +115,14 @@ LXC_CONFIG_CHECK=" ~CGROUPS ~CGROUP_FREEZER ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~RESOURCE_COUNTERS ~CGROUP_SCHED + ~CGROUP_PERF ~BLK_CGROUP + ~NET_CLS_CGROUP + ~NETPRIO_CGROUP + ~CPUSETS + ~RESOURCE_COUNTERS ~NAMESPACES ~UTS_NS ~IPC_NS diff --git a/app-emulation/libvirt/libvirt-1.0.4.ebuild b/app-emulation/libvirt/libvirt-1.0.4.ebuild index 8f694d969f47..c80087de0cd9 100644 --- a/app-emulation/libvirt/libvirt-1.0.4.ebuild +++ b/app-emulation/libvirt/libvirt-1.0.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-emulation/libvirt/libvirt-1.0.4.ebuild,v 1.4 2013/05/21 23:56:31 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.4.ebuild,v 1.5 2013/05/22 15:56:22 cardoe Exp $ EAPI=5 @@ -115,11 +115,14 @@ LXC_CONFIG_CHECK=" ~CGROUPS ~CGROUP_FREEZER ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~RESOURCE_COUNTERS ~CGROUP_SCHED + ~CGROUP_PERF ~BLK_CGROUP + ~NET_CLS_CGROUP + ~NETPRIO_CGROUP + ~CPUSETS + ~RESOURCE_COUNTERS ~NAMESPACES ~UTS_NS ~IPC_NS diff --git a/app-emulation/libvirt/libvirt-1.0.5.1.ebuild b/app-emulation/libvirt/libvirt-1.0.5.1.ebuild index 6959c703fd5b..dd4be2fd490e 100644 --- a/app-emulation/libvirt/libvirt-1.0.5.1.ebuild +++ b/app-emulation/libvirt/libvirt-1.0.5.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-emulation/libvirt/libvirt-1.0.5.1.ebuild,v 1.3 2013/05/21 23:56:31 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-1.0.5.1.ebuild,v 1.4 2013/05/22 15:56:22 cardoe Exp $ EAPI=5 @@ -116,11 +116,14 @@ LXC_CONFIG_CHECK=" ~CGROUPS ~CGROUP_FREEZER ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~RESOURCE_COUNTERS ~CGROUP_SCHED + ~CGROUP_PERF ~BLK_CGROUP + ~NET_CLS_CGROUP + ~NETPRIO_CGROUP + ~CPUSETS + ~RESOURCE_COUNTERS ~NAMESPACES ~UTS_NS ~IPC_NS diff --git a/app-emulation/libvirt/libvirt-1.0.5.ebuild b/app-emulation/libvirt/libvirt-1.0.5.ebuild deleted file mode 100644 index 6671814f1e66..000000000000 --- a/app-emulation/libvirt/libvirt-1.0.5.ebuild +++ /dev/null @@ -1,426 +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.5.ebuild,v 1.4 2013/05/21 23:56:31 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 .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 -} diff --git a/app-emulation/libvirt/libvirt-9999.ebuild b/app-emulation/libvirt/libvirt-9999.ebuild index 61f089242766..be52b9a99ef8 100644 --- a/app-emulation/libvirt/libvirt-9999.ebuild +++ b/app-emulation/libvirt/libvirt-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-emulation/libvirt/libvirt-9999.ebuild,v 1.47 2013/05/12 01:51:26 cardoe Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/libvirt/libvirt-9999.ebuild,v 1.48 2013/05/22 15:56:22 cardoe Exp $ EAPI=5 @@ -115,11 +115,14 @@ LXC_CONFIG_CHECK=" ~CGROUPS ~CGROUP_FREEZER ~CGROUP_DEVICE - ~CPUSETS ~CGROUP_CPUACCT - ~RESOURCE_COUNTERS ~CGROUP_SCHED + ~CGROUP_PERF ~BLK_CGROUP + ~NET_CLS_CGROUP + ~NETPRIO_CGROUP + ~CPUSETS + ~RESOURCE_COUNTERS ~NAMESPACES ~UTS_NS ~IPC_NS diff --git a/app-emulation/xen-pvgrub/ChangeLog b/app-emulation/xen-pvgrub/ChangeLog index 7200c8d25dcc..61d4dc245b68 100644 --- a/app-emulation/xen-pvgrub/ChangeLog +++ b/app-emulation/xen-pvgrub/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-emulation/xen-pvgrub # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.24 2013/05/20 14:15:45 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/ChangeLog,v 1.25 2013/05/23 11:55:57 idella4 Exp $ + + 23 May 2013; Ian Delaney xen-pvgrub-4.2.0-r1.ebuild, + xen-pvgrub-4.2.1-r1.ebuild, xen-pvgrub-4.2.1-r2.ebuild: + Add jajl to DEPEND, fixes Bug #471008' by ago *xen-pvgrub-4.2.1-r2 (20 May 2013) *xen-pvgrub-4.2.2 (20 May 2013) diff --git a/app-emulation/xen-pvgrub/Manifest b/app-emulation/xen-pvgrub/Manifest index 2e27e971668c..c449749417cf 100644 --- a/app-emulation/xen-pvgrub/Manifest +++ b/app-emulation/xen-pvgrub/Manifest @@ -23,15 +23,15 @@ DIST xen-4.2.2.tar.gz 15602746 SHA256 c9bfe91a5e72f8545acebad9889d64368020359bfe DIST zlib-1.2.3.tar.gz 496597 SHA256 1795c7d067a43174113fdf03447532f373e1c6c57c08d61d9e4e9be5e244b05e SHA512 021b958fcd0d346c4ba761bcf0cc40f3522de6186cf5a0a6ea34a70504ce9622b1c2626fce40675bc8282cf5f5ade18473656abc38050f72f5d6480507a2106e WHIRLPOOL 8fd7010faf6a48a9c7ff4bcfe3ce4fe9061eb541259e0a2d0def214e8c4becf2b22e8d6f96f65ca827abffeaa9d96e95ed2402844f99835f7b079fc9f3e84276 EBUILD xen-pvgrub-4.2.0-r1.ebuild 4475 SHA256 fceb4fa420c5ec25efb54c986c89c183b663f633a1ac3d1ed697503947524cb0 SHA512 953e3d435f03b4bc84a65c5a5abced627786d879b04e4dd70bfbe55d2e85d52d56f1ed24ede8b6e4fb9700b337e691d63a93fd0a70df6866888a8259dcfe9903 WHIRLPOOL 473239d1e09c24a6cc33a64c55917cbbe4c25e57dbe30e97bb2c9ccefaf8ff77dc7af61097527f7c8b608ddf33e13c26e990d3f2b0e40882dde3964342f7431a EBUILD xen-pvgrub-4.2.1-r1.ebuild 4284 SHA256 828aa5f490ff327d4ec7f980fb332718896ec3a29fe8b404a76a47f2f3a74c59 SHA512 85928afef0dc195519794363a1cba95c813372cc87901cbf37dfd08a92d1e3b370c6a224975a4b2ac6a7afbd8a7888400fbbca84b6aa171256a1d28fa597a0b0 WHIRLPOOL 4d9bc9d2879bc5a06df65f143753a520084307fc943e3d3a647b4d0c64fc92d141ab17131c21a571f4fa32e11ebe35e44cff436f012b2fd7d85dcd9ac22142c6 -EBUILD xen-pvgrub-4.2.1-r2.ebuild 4544 SHA256 b01606d665086adb4c9f692dbb5fbbaf4949d758241098cbfe4ce415254a34ba SHA512 b0c860ce244ee72d38437a43c46e7cd66422437d146121a09aa8a7a1aad0e4c331a2c459cfbf253a1b5343179d2353fd1763eb91b81e3aecd63a735ad00a16e4 WHIRLPOOL a01d4f16b6ade5a5c6fa3d23ef3b5048d494b167d48e654cbb61a5d3d966d718d60170488fb8ef4c4b87d807cfbb4608e5791ab58855f08b6b556adb9188a3ed +EBUILD xen-pvgrub-4.2.1-r2.ebuild 4558 SHA256 b346a0acf3b6fff534425b7cd0f21b5938562eaab9b0a9bc8586d70372644cf1 SHA512 933ac8dade7282a631f13b458c84a0cf74327cb00ee0a14e2fbafd60f21dbd1f750ccef18ecf2584d8ca028f5f75e0e9da68dd390725c2194c03d20b8cffed2a WHIRLPOOL 85dba34ed2328f5ec87fabcee1d9c450fe5c77514b021b3d3756a881069cac81808706961a66ceb34d5e0d1070f00c889b4744ad4e3b3361e130a8e3a8b922f6 EBUILD xen-pvgrub-4.2.1.ebuild 3676 SHA256 acd0892c712e9d0029d9ed6084fdfe872e44bc55b45a9de731cc88e56c7d5d05 SHA512 fa91836feb63768e8d1870874a3fb0445e5483ef708582003f7b13ac8315a1134425ddfb8be10565a779f0360cc95b670a86a6043fee4144846ab9548cc9a4dd WHIRLPOOL 349dbc28d6739e9820e3c42d6013acf1498a17c80e47477851ab5eca8320dae7fb78e4939c7ccc5e89a410c3fbe98684163b04c0ea144f7d796c46adcb67e6ac EBUILD xen-pvgrub-4.2.2.ebuild 4390 SHA256 a8d90e9d7fe36308a76cb0e08d1da40b809b74572343c5150a79e1b8a70751dd SHA512 8fedd4dc35053018d6aad91f4042299cfd9f0bd0cdd1f0c6c85e76114878e9134cc00fabc58c5807c911b85dc69374dd47896d97a1e9d1bd91b434bfbca64b6d WHIRLPOOL d1e3f4227aebdf47f399a9d130c663c962dc8bcde151394803a767508aed77bb25939592fbae57ecaae435b8811cb2f9f6be0c7e7a40d2f6e3c4de1a8f741032 -MISC ChangeLog 6102 SHA256 18cc24c3d7ef58ce041b2c03b0b71165278f5b8e0193cc501556256073edf814 SHA512 10bfb0ddf40dd211ea1e5d5d6da89fed0404fca85682b4b39d78e2017d83052696ce7e8f78624e2bf66efc235dcfc58dc9e5c2861b1e45d036ede7e6ad7fad7b WHIRLPOOL 15efd7bb02642083db189b9b44343800bd762e3157560d9750c4159b53ed6c1d2c55fd22cf7dd3c4c47e029b37277ce3bdd29d555cc724c1dd5b17f0c0eadb9e +MISC ChangeLog 6285 SHA256 785b25ebe6797bb4808ebdc331dd5edc8c99db7dfc6775c2785a6b6e77e29970 SHA512 72037ab1fb728619b62e566811bdd8628fbdab37198b7771b433d0a0935a01db8efcffd9af63b7d2edde37cce61c195a80197009fe7d688c4494fda8e6f6efd5 WHIRLPOOL d65b6a8a25c40993cc766544e1391454b7f16fe914cc7d345062f3be150dc4a252cb1dc338ca33f309c79ee8421c3cf527bf78438569da1351420e2fe71fd12c MISC metadata.xml 156 SHA256 4a030777459245372bda9f7925f3a5ed3ef2b29b77e1a2971f3400ac2059b1e2 SHA512 66b610ce3a3c525f52ad132e0c6cab329866069d8f40cbfc7302b12f8fc1217705ce9d5aab9c08ee3f7eb86bd880b5c3595b10c3eb67932148a109ec11b88c22 WHIRLPOOL e7f151fa553d737c02f8791448170ddd88b9330b1b01a868cd5c32a875b58b36dd1e2b041308f657d35550f22e5798cd96037c3c890c0646119046f984505c23 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlGaMCMACgkQso7CE7gHKw3b/ACcC8I3ljJ3bcZAnqgQBkmeFKgK -rbUAoNgiqbWI3R5IiVgTn8NvcX8GBfy3 -=tU14 +iEYEAREIAAYFAlGeA9kACgkQso7CE7gHKw1pRQCgnLJEQRF8rZ08FI0zR3uHCO7Q +hYcAn3rdvtjTo1LbxQ9XYJ8a7SSFiJ7D +=O1yg -----END PGP SIGNATURE----- diff --git a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild index 0447dd542a15..69fcfa5f808c 100644 --- a/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild +++ b/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-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/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild,v 1.1 2013/05/20 14:15:45 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild,v 1.2 2013/05/23 11:55:57 idella4 Exp $ EAPI=4 PYTHON_DEPEND="2:2.6" @@ -27,8 +27,8 @@ SLOT="0" KEYWORDS="~amd64 ~x86" IUSE="custom-cflags" -DEPEND="sys-devel/gettext" - +DEPEND="sys-devel/gettext + dev-libs/yajl" RDEPEND=">=app-emulation/xen-4.2.1" pkg_setup() { diff --git a/app-i18n/transifex-client/ChangeLog b/app-i18n/transifex-client/ChangeLog index 4ca57f2de700..3002732a7fd8 100644 --- a/app-i18n/transifex-client/ChangeLog +++ b/app-i18n/transifex-client/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-i18n/transifex-client # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/ChangeLog,v 1.23 2013/03/03 23:09:28 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/ChangeLog,v 1.24 2013/05/22 20:10:52 hwoarang Exp $ + +*transifex-client-0.9 (22 May 2013) + + 22 May 2013; Markos Chandras + +transifex-client-0.9.ebuild: + Version bump 03 Mar 2013; Markos Chandras -transifex-client-0.8.0.ebuild, transifex-client-0.8.0-r1.ebuild: diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest index 14e07a421cd5..8631f4e54cbc 100644 --- a/app-i18n/transifex-client/Manifest +++ b/app-i18n/transifex-client/Manifest @@ -3,25 +3,25 @@ Hash: SHA256 AUX transifex-client-0.8.0-tests.patch 695 SHA256 e90cd4c2fb763ba55ad88e0c1757d29a6135e47aac4ba4b6400a297c77cc08f2 SHA512 3efcc84a5cbd53cca347002fb1f399483c967d37508436f2bbb8a55fcf2d9d752da807efdb21351230e54cd85d896646c4c73dd7067940266f8f95e3f7821c0c WHIRLPOOL 37e3ce9bb44bda09010b2291135f2cec9cb210d51536a4865b9971f8208bacbb2a311756b7420e2b2f4ad5acee8e2c7d875e44d1dbc9a01eb96fbede0353d1a1 DIST transifex-client-0.8.0.tar.gz 36336 SHA256 89abd9426b35a6e5f2f4c096c6e83fa6e59d4b0b73f721ddbf19027ce3167adc SHA512 77750de853d3fb7f3228a04ce1b6c92c2ab67a6f4001c44cfb243132cf7039228467664ca01b2c6ec420dbedc7e4d54dd1ad7ee2534c87b37a13705fe5b163cb WHIRLPOOL 795ff3e700bdb63d1d10bb2a7440073b36d5ac43b583fc0ad58895f3d72f4109d24b5f6a0ca19149aa55a2fb1395bd57ab05758f7284c4849f3701b6315dda4a +DIST transifex-client-0.9.tar.gz 35995 SHA256 8f2b716783781761cefc4508e759bce63147b90c30941da92e5da06bca053099 SHA512 689c1ef57553d11123b1ef202bf4b2447e86abc08f130b6171ba0fa5c0d8cd16a141f4fe98a8fe3c36da6825933c4dd49662d4460d7896219ce28655452e65b9 WHIRLPOOL 3d7c3b54199017504bcf1ffe848df5332dab1a3230d294ab3346861d1eed4392f88b9dbe2e31fdec3d19b57ef20dddf95fafc6642b2b3308680058fb9125a0a3 EBUILD transifex-client-0.8.0-r1.ebuild 859 SHA256 36601832ccf9348922d9e63500de01ed765473c03b8f34900f64f5c52695d91d SHA512 d5b57003572c3f4ea4652f25fd0561b28a9a06eb154e13cea40300ab2fbfea0adfa55c451ab6fae7fe5047e51a7f14cb587c088fb21022e595ccc4aeb735a568 WHIRLPOOL 71dc4f6c7ae41d23de55e1ea1c710a403736a9bd1a85a6cbc0a367359a2fe532818806cc786269a51fb74197c2573c45a7326ff1fdefa68c6d80b0398a927122 -MISC ChangeLog 3446 SHA256 a9ec47afff6ea82b90fd0cf744f81ebea728d27187d816f965a5f73117aad3dc SHA512 3159eecd852e40c0fa7d15e9e25247b9fe32b59916579a0af560d5da0c8f534b10325d133fdb07e113a21d06441eded05506851ef1dbd46b633a7f584809fecd WHIRLPOOL 6a5738565ac7fd65d62bd34b89b6fedc9a427be5ba9141020767f42df2f9c71c65833470153c122e103d7f019bb3e66456f0704df0ab37ed051a62841bbcd5b0 +EBUILD transifex-client-0.9.ebuild 638 SHA256 7bf3abf9a4f20f04baaa3262b70bcc31b4ea08aa0db9addebdbbdf43c9974d31 SHA512 d046507dcada03ffd8acdf99b28f48b14b1a1a667717bb0274211950c900c9bd2bcec775d42dc5b2ee4d8297975d3a59db3a3316eb9e031c659134137e8e12a2 WHIRLPOOL 7056196bdafd72703f0749e309ed0b7dbbe41d664016b0b180f8f4e2282b1d0dca75991bc6b5c9e7928903c48ae6c531930eba4b78924b9de62b6e5a3b291a74 +MISC ChangeLog 3584 SHA256 e7966eddc21f9bbf7c4c9af4ebd713c15a256cc938acfd2bb0a9df3e42d79039 SHA512 9e8e37ef9e53331b5c6c6b2a6d1e9e076b185b1fff04cec6c9be845b4997a7f7b5614cc1a98ab07d4712bab76c235a6e921f6d47b10858647e83bd4c85a466f2 WHIRLPOOL 189dff259e47bdbb506a253d812f7445630b854a6466632e6f6fd6c1a1754d3fa4f065815bc28a9fa495e1c78ab77bdf64219ac7bfc0954ca2bb671572284cd8 MISC metadata.xml 315 SHA256 4d73835d9e9caeb4e96cf4fecf432b9fac5f49d18559ca79c304b6dc35d6c228 SHA512 07e27145f2272f6994d303531f84940507a9ad25fbd30e343708c968d697959e48148dada4479eb18d3985bce38f35c6705b4f840514b861f2270bb7e220be72 WHIRLPOOL 5b61653c5caa572d99cf78ab28a8c0e8fe587a0ce4da7656dae5e3b50adda54c4634585f4851e7bc17d78d80aa37b5c677fd8884732e744a983ec20cbb741433 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQJ8BAEBCABmBQJRM9gmXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88yF0QAJw6TIVyaKNRN6aEbyJu5InH -9/p88LfzqtUgKCzujeFIo9yz+ZD0Gfu3sNNq49PuCz9nNsICXcgsMFZPery1aZY3 -/P64FZoJAtBohyieAwrW6vYzSYlkq8JC2tpN7PxKNBbuNCMJCBgx00sWk+5vBARo -OQLpGibW9JU6TkcSqMIr9HGtk5buDixjGQg1YrrUXQAtD/ZALqG9IyUHenfgIVNH -21A4RDEq3J1oSzsMof6Szo1jVonjo8UuWJgEEyMfgmdiN1YR7cWpD02dpjcWaYg6 -qeCx0ic13VoY9q35xgqXzaDWI45RiVj2wR6mtAyAMpZuIelXpr0hlX2yYFwQT0ys -Wa1jXPOADoY2ZnTAjpIDkA6VmCDI0yUaqkNnjB2dBegS1psLtJozKZ0oL5UmyTIN -Iz/mSuR4Zh6xGdFqcaqrX+iVazoYVUdwk5vVNAN/CZfGQP5iS7porXWOFu2VcCa2 -VMnFoaufLm7ZpqAzh+rFA2jJJYELUB9siGp/isM2RMTvvQ/3uDAO1NytJqLMsR2t -E7PF2pJWQNza6s9+NgQA4/MTlQZjLn4jO6C+zPoorO/VIqS7h2Qlb6WOGGNuaCYo -qQFEGkovR5J6/Q5hb6W+/EU8xLztWuzmaVarZ/otiSlQVVUi5KaIXemith+vvJVk -AyBpWlATS4UuduRkjbpA -=LcVN +iQIcBAEBCAAGBQJRnSYJAAoJEPqDWhW0r/LCZVYP/321GcYauw5+9fydUFtITKXp +su0KrhQgrv7UH/IETQz4H3+Jky7MOkNmYRR1YzB6I0Qd6OpV65XF2XkULVKvDnnd +16Yh70rRKWnc2gPRHBbHeFg5jhQ4AWtD17I1uGAa+Q4xN8MQrQkgYxx7ydxy3aHd +6c5Kr3BQU1P+ed93LjKz+/QAF3C8IZL5TePgfrBywB3gZkMBo6i/52ecxh+y8XPP +qDnn9XQtX0rLUSLm4/tROStuEeJhMFu9wFJHNfLz/IoFBqDKbZX2wT2+eu+iWoQO +eD6f/zsmcfJEX030isJk/+5BUEEcYA7Bzkx4Hd/PCspTgNdgqIH2AGHUZrj8aAtg +YcZ5JSWynD65cyyz38itGBbqI6UJWr4X1VLGBxsDOstJ4dnsj3soOiuerdRb/5AQ +LGBFtOH1KGkPBwH7PpcixQCjEeyLgUm7r4jK6UHOLLbFl7kxUvFCK4HGbv2S9wpj +Beo9Qt/g/gtiQeK61CMcr4TzDh4zbhJ3/bSDaaAlNMZUHgBJdiQD5PuU+XF6qNqH +Z6ZXS6dJe/1Sg7msXE/klFbM4o3wg9vfpvh997YSIjtEAHZGWbIp1ipRFI85JiA4 +ioexR4oQWPwtosyyMzGK3jiBfK8MQlX3NqduhHvbzKiPfltez832BijecqF6M+ZD +cdGIWDVhAtWEJAoodtsP +=xStO -----END PGP SIGNATURE----- diff --git a/app-i18n/transifex-client/transifex-client-0.9.ebuild b/app-i18n/transifex-client/transifex-client-0.9.ebuild new file mode 100644 index 000000000000..e2643feac875 --- /dev/null +++ b/app-i18n/transifex-client/transifex-client-0.9.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-i18n/transifex-client/transifex-client-0.9.ebuild,v 1.1 2013/05/22 20:10:52 hwoarang Exp $ + +EAPI="3" +PYTHON_DEPEND="2" +SUPPORT_PYTHON_ABIS="1" +RESTRICT_PYTHON_ABIS="3.*" + +inherit distutils eutils + +DESCRIPTION="A command line interface for Transifex" +HOMEPAGE="http://pypi.python.org/pypi/transifex-client http://www.transifex.net/" +SRC_URI="https://pypi.python.org/packages/source/t/transifex-client/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="" +RDEPEND="" diff --git a/app-misc/gramps/ChangeLog b/app-misc/gramps/ChangeLog index 17354f8971a0..3ae5cc6150ff 100644 --- a/app-misc/gramps/ChangeLog +++ b/app-misc/gramps/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/gramps # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.165 2013/05/16 03:50:48 fauli Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/ChangeLog,v 1.166 2013/05/22 21:44:09 fauli Exp $ + +*gramps-3.4.5 (22 May 2013) + + 22 May 2013; Christian Faulhammer +gramps-3.4.5.ebuild: + version bump *gramps-3.4.4 (16 May 2013) diff --git a/app-misc/gramps/Manifest b/app-misc/gramps/Manifest index 688614c2d825..6c4cf73228b9 100644 --- a/app-misc/gramps/Manifest +++ b/app-misc/gramps/Manifest @@ -4,14 +4,16 @@ Hash: SHA256 AUX gramps-3.4.0-use_bsddb3.patch 447 SHA256 a4a7c57c202f65cceed8065e4d5649c02d316203ca31137cfccb98a989b6b3cc SHA512 35f9b2be431106c9e7fe60e3f2c6f56b6b01159c64f733c1b1b85449101e2dfc8bf3759a971936876124df7d7527d312f09f4575a293aa6669310abe77d15044 WHIRLPOOL 24f0b41023b73b89897d391da73f00221b25d2674fbfa5be0e72d5869a9989ff02db6aa3819c486f25528859f13593b1dad25543c38e74fe555dac6b7ad768b1 DIST gramps-3.4.3.tar.gz 10358169 SHA256 f7a87def57d1d3fbdc9f4528da50742bbbd6dfc7e8c5e43710f5a8618f9c46c1 SHA512 f30a5f7ce89f3570f73a7576906342edab25d3c3d12686acc0d5ec6fff142e443f42d3345a55e30ca47a304fe63225b310e7d11ad3d22ce69098a539f9adae02 WHIRLPOOL 59d237da058831bc6a5c9fd0fa305c34f6d5a90491c80916624d83a61c30800007b2da2c112b2dae0f53295e25631d7dd7ea47c3cfb30fb449f878be8d3f23a8 DIST gramps-3.4.4.tar.gz 10613997 SHA256 b4a44cc23357b59bcf945fd76d4d4de5a75bbdb32da3332ee23422196240be50 SHA512 ab68fd56fc47fea4fef8f9e35e4ff2c4d6017fa6018d4a0cf581b066b89008e56bd7b46a67588ffab7894fb2a3a07a38584d4cdfb36d0d10450fd40fade67b73 WHIRLPOOL ece67aa6fa1f1c8091f8e01a906a31150fdf10fb076d02e28fd0bba1ceffd0ea8f3f29dfad34359cfc07891374a52f9906dd6ae3afdd29adfe73a5b045d91c2b +DIST gramps-3.4.5.tar.gz 10444188 SHA256 940b665a2e0dadf7ee310bdd1a1033c20816c856df8a7d6c4e0850a60471dbc7 SHA512 c9b517f58712d9f585dbddcb394d3605a5f823950a8c3c5a4ffd20d1a8523d6b75f9b6193271adabe76edc073dd6b4c20811de62582a2930b84d88922b4e52b3 WHIRLPOOL 4e30108881900883a4cb3c3ee4c9ef78e04d0850c3dbdaf97569f44cdfb2e56463f3f156f041b4dec6650c722f12cc0909689edc9591c97c5b02b1705860c228 EBUILD gramps-3.4.3.ebuild 2217 SHA256 dd125b9e9089b55d52e769f08ab557b53242dec5f26eb78066e54761b34da845 SHA512 4d53d25dabbc64bf3b00bc6e395685a9d5644215079dd3bae0ef4ad75ff38ab55f915d80b11a25caeee649f27949077ce9ac63c078d2d1810d54c13dd1bf3be5 WHIRLPOOL 58865668276bc6fea7a4001664d910458220fbdd949594f66138ba4aa1511a5a7ffa3ed4808851914a6e7d1578c3ab5136a90cb826b1a95dd5fdcc4ab5cf1511 EBUILD gramps-3.4.4.ebuild 2222 SHA256 16679c90f6f700162d7c4debff87b4a4349d042b75c267d4c4c0d99620415826 SHA512 ed0b9e771a6110f9b52d05bc76a1424da7309b9ddebe1c54b5d6fdd8d873875aca5213dc229d833c8d05a11fd31744bf199759f9f8a4a70ca5b3a20b5daafdab WHIRLPOOL 5fc8149639389f60082200eda876ae37e3ee9b9ba539093fd6ca812c1cbdd152766840716b2565f077f459eae2d996929cc9a52483882936983658d98080b04d -MISC ChangeLog 23607 SHA256 9d6ac4cc57fcd1e2ad56060f11b26cc2cc76f0f7eebc38f02a57b3a25011aead SHA512 2c3611e20aa443efe63825b0575c35751ed49b640d8b251757efabcb685a4efdb748103decbc143c104f69d93d85a8c1b7ebe991e5bdb12eb6cc2daaa406f0c4 WHIRLPOOL af71d43ca7d4684a2287d0529bfcb617bed0229333d8af38d8f27fe3a2847f16b93b2994186d5f424a1f15bbc65db62a9dbb87098f630604d3d2876ab7b8e055 +EBUILD gramps-3.4.5.ebuild 2222 SHA256 ce3a60a3e3b7019e308331b052a6581279510b379cc8ec906944aa74a586df47 SHA512 9d130adbf35fd695b0c53c41162870097a2206b7a2cc2bed20420afe5325fb1efc707ee0b3efbf64eb170ed623672928e323229685e65048d260bea17f79e6aa WHIRLPOOL 969a4dc74613db6b20d8e1b53965b29fe533c222e3406bbb9bbf5094947b26591b931e1fd10893ef2b245dccaf4bedc90b2f1fe039e5ea6b3febc2c85c90fa8d +MISC ChangeLog 23729 SHA256 3e3056ec8d8234eeb26ab1d5793e824e0aa75f75db7ad8e08d1c7eb9173c0faa SHA512 9cab24d302a17d896a4aab73dd8202c05c0229118427f29b17fa858cf747cefb925c5c706fa0d3212c273fed6a6c4914692564a3fe32624584cb0e6aea0027ae WHIRLPOOL 8182c56c51b916f818397a539f30fb2379aca926a6703c3f3f3178cae7094aba40076eed3dd7f32d97d45ea2f7eb962c4d560ca36eb7dae4dc6171c688c12eec MISC metadata.xml 5192 SHA256 c402d3f7be6f89296b26d29b4f9e3c1ca93f306d8afb53da391b99a0122e8cd0 SHA512 960c4c0313ad3756b6e865db19477f5c00bfa50f31232f0dea4bfa57ca7f22b2e6e134d3ff939aaad14f5e700a0b35ab7668acf5ffe3333e4aefecfa38e23c74 WHIRLPOOL 15e2fafc62e11317016ef7d1c29fb7118e16aa7bea3bf6d70cf5f80b1fb54148f916ac989bf304f90d7d54461f25bca80a6c32cef7f0a0446359005499e7ae2d -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlGUV58ACgkQNQqtfCuFneOHXACcDg13SCtjlyPeEHX3K1ImS7sP -FSsAoIFOMo4Vw0p4orbKl8J5iI+nYlKe -=90YQ +iEYEAREIAAYFAlGdPDAACgkQNQqtfCuFneMkRACeP7Jr4oXVr+U2VrLm+WHHH4DK +1OgAn3Yp1DeWw4K5Wic6250baR4mmUuO +=QGet -----END PGP SIGNATURE----- diff --git a/app-misc/gramps/gramps-3.4.5.ebuild b/app-misc/gramps/gramps-3.4.5.ebuild new file mode 100644 index 000000000000..0483d0696ff7 --- /dev/null +++ b/app-misc/gramps/gramps-3.4.5.ebuild @@ -0,0 +1,90 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/gramps/gramps-3.4.5.ebuild,v 1.1 2013/05/22 21:44:09 fauli Exp $ + +EAPI=3 + +PYTHON_DEPEND="2:2.6" +GCONF_DEBUG="no" + +inherit eutils gnome2 python + +DESCRIPTION="Genealogical Research and Analysis Management Programming System" +HOMEPAGE="http://www.gramps-project.org/" +SRC_URI="mirror://sourceforge/gramps/Stable/${PV}/${P}.tar.gz" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="gnome reports spell webkit" + +RDEPEND="dev-python/bsddb3 + >=dev-python/pygtk-2.16.0 + dev-python/pygoocanvas + x11-misc/xdg-utils + gnome-base/librsvg:2 + gnome? ( dev-python/libgnome-python + dev-python/gconf-python ) + spell? ( dev-python/gtkspell-python ) + reports? ( media-gfx/graphviz ) + webkit? ( dev-python/pywebkitgtk )" +DEPEND="${RDEPEND} + dev-util/intltool + sys-devel/gettext + virtual/libiconv + virtual/pkgconfig" + +DOCS="NEWS README TODO" + +pkg_setup() { + G2CONF="${G2CONF} --disable-mime-install PYTHON="${EROOT}"/usr/bin/python2" + python_set_active_version 2 + python_pkg_setup +} + +src_prepare() { + gnome2_src_prepare + + epatch "${FILESDIR}/${PN}-3.4.0-use_bsddb3.patch" + + # This is for bug 215944, so .pyo/.pyc files don't get into the + # file system + python_clean_py-compile_files + + # Fix install path, bug 423315 for example + einfo "Fix installation path" + find . -iname 'Makefile.in' | xargs \ + sed "s;\(pkgdatadir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \ + || die + find . -iname 'Makefile.in' | xargs \ + sed "s;\(pkgpythondir = \)\(\$(datadir)\);\1$(python_get_sitedir);" -i \ + || die + + sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \ + -i src/Makefile.in || die + + sed "s;\$(prefix)/share/gramps;/$(python_get_sitedir)/@PACKAGE@;" \ + -i src/docgen/Makefile.in || die + + einfo "Fix wrapper script" + sed "s;@datadir@;$(python_get_sitedir);" \ + -i gramps.sh.in || die + + einfo "Fix icon location" + sed "s;gramps/;pixmap/;g" -i data/gramps.keys.in || die +} + +src_install() { + python_need_rebuild + gnome2_src_install +} + +pkg_postinst() { + gnome2_pkg_postinst + python_mod_optimize ${PN} +} + +pkg_postrm() { + gnome2_pkg_postrm + python_mod_cleanup ${PN} +} diff --git a/app-misc/jq/ChangeLog b/app-misc/jq/ChangeLog index 11ce54fff614..928186055da7 100644 --- a/app-misc/jq/ChangeLog +++ b/app-misc/jq/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for app-misc/jq # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.6 2013/05/01 16:49:47 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/ChangeLog,v 1.7 2013/05/23 06:36:08 radhermit Exp $ + +*jq-1.3 (23 May 2013) + + 23 May 2013; Tim Harder +jq-1.3.ebuild: + Version bump. 01 May 2013; Tim Harder -jq-1.1.ebuild, -files/jq-1.1-makefile.patch: diff --git a/app-misc/jq/Manifest b/app-misc/jq/Manifest index b82921550df2..7b08d6994b90 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -3,17 +3,19 @@ Hash: SHA256 AUX jq-1.2-makefile.patch 802 SHA256 db36f90ee91141c20fadd18232526128b9bab730d056dbf6d62da353438e53bb SHA512 52a0566dc48fa3574667e794edeeee2edad81220d13bfd1d8a82d980af570296c9f76ccc8c9e72696dc59e9ec256187ac29d9178ea6d0f1463d7ee176f100c36 WHIRLPOOL b2ac2229bf127ae7e87f444968929afa85955af5b8d6c435072570133f662395c330effde2e9305d89d3a68cee865a7840f4fb44dddd758430746ed6d1ab9458 DIST jq-1.2.tar.gz 180256 SHA256 0cba62de4265894aea2a4b69d8ac094efd3b3a3a84f2c5987f7ee652b068a7d5 SHA512 38f66c9be0eecc18840d1fa7bfd225e91d045c8b6feb638980a24a230f0b9d34022bd9f12a5c5c262a17fd03236e455a450116ed7c074afef59a8f1afde98980 WHIRLPOOL ae0945f65038c122aa2f770dcbb0dd1c217f3dc60ab5d97a38467402bd394f0b2a1729803af8a7ca1aeb0986c5ae4d35857cbf0fd4ff2085b94682d232a62139 +DIST jq-1.3.tar.gz 333678 SHA256 623f23c36abfc1d96d85020cf421b56f90a229d566f26a4a0d3e8536244bfed7 SHA512 50a3502fc6f6d571d4dff47fae59b47c7171d094fb953be8bf8185e21e7b4bbfe8702a4d668214cb6e5d8d7889b49c9b34ff7e48fd5583369b2265d0eb2d3578 WHIRLPOOL 75b8fdb8c5b9af740e4ffdd7a2dbb2b07dae9383b36ea4a13718e7b4281ea83c88375d4692fe303e67ba0368cdc6aeea1b4c9d9c2c6b4fbde17b0eaa4d6582ba EBUILD jq-1.2.ebuild 701 SHA256 766ea92a0c7c1f13d06541022268a55449315ea7582f9d86c5b3c2515a198e87 SHA512 b79d240b1fc618547f14a4cda638d634d58f01365f0a8afef4b50938262b6d891311fabab9be35e37c61f1981ce6b3be1d88bc2b823c329f769702110db22242 WHIRLPOOL 20464cd100f6ee287bdebd0d4f1eb2caba1eb8f7dca25f0906b4f66d05688797b22cb7a2d9286de2d435ab2633a95ddf72402ee63a42a60ce4d972f97c503ea1 -MISC ChangeLog 943 SHA256 a343699ab4c400b6df778032e0b12cd60914ba6e6eeb6f3899021ea74de96014 SHA512 a3eec6969e12bf101fb9c6863eb16c52018e3c112051643bbbd3249ea44fb314544ca1426e73a74e4c859702633806fc638d4aaa4b99f09707c934c6755cc3a7 WHIRLPOOL 9159bc7268c59cd45aea33793cf30db7778261f9c0ded7c4287883c5e9024d700bcf9bb7c4b9fd45adec80f88a973c285305c7f906b0dfb0a308142187c11dd8 +EBUILD jq-1.3.ebuild 660 SHA256 066da89efab2c720632e0813532e9ad5d73267bbb942183ad18e8540c5c3d183 SHA512 9b0c6c55aba9baa7e1cb1be5175d80b061d188684c11479b330cd92d234fb0558075ec5a97230a5640ba1d2423d7141a69277927f8eb2d510193f19228009dd9 WHIRLPOOL dfd7a82ff78db4f5a9a21a2f018928572df95a3f6020e590a2e1c812efd032d3b7b831bdd8bd0777a13a35cd674d30ce918fe04285e15d021d88f2603dcd4724 +MISC ChangeLog 1048 SHA256 776d726460522d1fb386a20504c5affd4f139fa095b038095b924ccc163ae7e3 SHA512 ed36ebc9da0777f34e911d5db02fd08e3afe04e8283f8e982d5b01b5415cd9e22540358f6927f8ebebd77b1be00171361f7e1d3fa17fba63fe3a4b153b99d962 WHIRLPOOL 1477dfe973c8a2ab5ca40c67d10dd44f2dc178a468fe60ffb9db5df87d35a1b458e96af671587e2edd3dec4fe404dc4fe2f5cc3752383b8fd9d61fbd7ff2f825 MISC metadata.xml 236 SHA256 5285fd5ca6bc85e0392ff64ec8e54d0018ebd761d3977869c00c93dee45ea09d SHA512 a1abf9a60fb1a2078d0475df655f8abd4b2f877f8d232028232fafca2eb7e7ae6ec2c835c4fe0ef27b3b5655d746d1fe53bbcb353703819448ddec84acdd4215 WHIRLPOOL fdbf5fcd34aa17330575f013aef4c87a8b039b62b6de3337a4004a6a0217238ceca43fa15425c30ddb7a5a632de7eb138ed541dfb161614cba817527297781e2 -----BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) +Version: GnuPG v2.0.20 (GNU/Linux) -iQEcBAEBCAAGBQJRgUerAAoJEEqz6FtPBkyjvVAH/jgD1sO4YeH9jy6QsyOC+VcH -fLKjO9uuZKup5z2N5hgJufljX33jSIIdZK/hOrITiqZShoQU0F8l5YcI5ssrBV0G -cxxYO8XietbAWic8vf470ka11iKAhswgejNqSYwksc6ME+dHAC557v3qfRnsEbjQ -810lBT8w1IjC/R4oQMoJZEI8uwBGRqRR705WkT5fZ8ol58egH2Dgxk9WnYGQAzPh -xmBrrku0KmClEvGFqIwlo4T02g8B3c39Xk1HpE9Pa4BOKLFNbhY+z3HJtCOCVMVZ -XJPrJ4tq7d1zeCVim3P/IJbbpXhE1lw+yRU+To/WgOXOtrzumR7MyYkuaei0O5M= -=e9j4 +iQEcBAEBCAAGBQJRnbjZAAoJEEqz6FtPBkyjNSQIAKLlJwgBfpUVWiO2sAbeWwZT +w9DT3nTfSgYfb0j4fbR1RhTP8GDHOIpYl2zGXNjPIGkcpi9XRsiHYRmdGes1U0Vz +Ez26Pm4ZTD9mGnaNKP1at9ayKN5GMMkqRsMIdM+AICPIpuvgheRZONxa4KSSeCWZ +n4rN+pnFK83I0+SdOAEDnXxQz0N+Tt3d89PC7ovcb8RYHZUO5tDz9n5RjftTd229 +p4G9HmEqbbwCgHGaAtlvSlWls5SDi4cteeYIb8i3a1Q6+uzdeIGSVIRDnE7TE5IT +XwzYIsE9zFCVcmn93a1e0aOfZdEbVrgA3bBEmkHYFMuHilDcbqCqlNVEgTTne28= +=EQws -----END PGP SIGNATURE----- diff --git a/app-misc/jq/jq-1.3.ebuild b/app-misc/jq/jq-1.3.ebuild new file mode 100644 index 000000000000..ed944fb7666b --- /dev/null +++ b/app-misc/jq/jq-1.3.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-misc/jq/jq-1.3.ebuild,v 1.1 2013/05/23 06:36:08 radhermit Exp $ + +EAPI=5 + +inherit autotools + +DESCRIPTION="A lightweight and flexible command-line JSON processor" +HOMEPAGE="http://stedolan.github.com/jq/" +SRC_URI="http://stedolan.github.io/jq/download/source/${P}.tar.gz" + +LICENSE="MIT CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="test" + +DEPEND="sys-devel/bison + sys-devel/flex + test? ( dev-util/valgrind )" + +DOCS=( AUTHORS README ) + +src_prepare() { + sed -i '/^dist_doc_DATA/d' Makefile.am || die + eautoreconf +} diff --git a/app-text/libodfgen/ChangeLog b/app-text/libodfgen/ChangeLog index 21d121086345..123a9b3b0fea 100644 --- a/app-text/libodfgen/ChangeLog +++ b/app-text/libodfgen/ChangeLog @@ -1,6 +1,12 @@ # ChangeLog for app-text/libodfgen # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/libodfgen/ChangeLog,v 1.3 2013/05/07 12:38:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/libodfgen/ChangeLog,v 1.4 2013/05/23 10:43:20 scarabeus Exp $ + +*libodfgen-0.0.2 (23 May 2013) + + 23 May 2013; Tomáš Chvátal +libodfgen-0.0.2.ebuild, + -libodfgen-0.0.1.ebuild: + Version bump to latest. *libodfgen-0.0.1 (07 May 2013) diff --git a/app-text/libodfgen/Manifest b/app-text/libodfgen/Manifest index cc3c499df820..d4388112d473 100644 --- a/app-text/libodfgen/Manifest +++ b/app-text/libodfgen/Manifest @@ -1,24 +1,24 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST libodfgen-0.0.1.tar.xz 270304 SHA256 dc1478b8f9acc9cfa59b9b206eb4fc9c082f640d7c35e9a6f6dbf025c60e2ff2 SHA512 defc4379b15bc0a0c9d68462eae1e25eaa768de01f88d814babfc9b88ab2ac57de2d0d2fe6303a1194f1b2d1bdb47d6b9d3f88dfba4a4476ecd1dc230d79978a WHIRLPOOL 4e7365197cd639607c1088d31c67a3d02fb58755c090ac4dfd5da7ca678c22b48062be78412eabc6257ea4cd1cec2dde20620c625be6560b084e44cf513fcf6e -EBUILD libodfgen-0.0.1.ebuild 821 SHA256 62750b34fcd1f4df856ebbfcd05ffa1232f81dcee0bdf17dfaf450e3261e4ace SHA512 02181be2ed543032df367417bc0c7cb9461381355fb149c726bc2ff282b5cce7df03a2ecd433bc5187b281752ebb971e82f7d12a0b82db6ede7da4e93e8bdee6 WHIRLPOOL 305869eab7eea129b33673a6304a05dd70e80b220b4ae60511df601ec60559b4162be2d0eee004de7b72825286bc1eeebe9caa684d047f53eb093a6863da6c00 -MISC ChangeLog 695 SHA256 42ed36988dea67b9902eb4e3d6266801fd8f3e31a89799f1dc812cf78f7e7837 SHA512 b107ff0cb2f5244288e54a743d84b06d0fa07e6fb123d6e50a4b52ee1bec633d496890f506a302ec5e5e2efe194ba442ca3cff6c9b6a20b6e246ff8ba0340b59 WHIRLPOOL 5c69ed5bf905c51042ef16b984bdfec6681b9d88edfc09d1e90623459e1c11b24ebd5c32e9fbe1c2963d5e893b5da35cf2d7227b5943ef13ec98666c4065052f +DIST libodfgen-0.0.2.tar.xz 270992 SHA256 6fe7932d86df6e7299ffc7377ab76638d5e54454fa8e614bad5b694b398ada2a SHA512 bd6735ad3f1d6a4ad4465a9975766e5d2bbcfb30ee6b3a28926147360c57420b533779ba3732ef5fc51f0c880a479bdc4dea163966cc8f414ff269c259db8cb1 WHIRLPOOL 188cc8a43b5b15c964fc556ddb57d66ab15263255427afe56926726da8e3e57d67b6991d14f14bc851dfd6fa34688bf4481d710b8c2a9164000f2711e7f196a1 +EBUILD libodfgen-0.0.2.ebuild 821 SHA256 fe1dbaf1c2bc35b9bc2883c12a587318076dbeacd6cdea04d73de5b39804fc75 SHA512 7c70f4bed68285bc47f58d869e359f8d99d44502fc994e6c2b549d0376fb80b40a160a9a40814462873b6fbd5c2e558f50a16184694e7ae7561af1e63c266652 WHIRLPOOL 9743c25e5ad5c3d8cf12bb7b4edcd4213f5ab6014e647dbec40c1c40bc0dd732b497149cb1eed3adedb5f9151494e03fd855568703167a32455eb0b4283910e3 +MISC ChangeLog 861 SHA256 fb2c8345199ef88d2d496e0205155a1233f7c037349cb65378c4c8650b79c186 SHA512 7b3e34969363e9c3c7706b2ab3ebb71f6b850c0c70c6a83211fd5c5cabe2fbd5aa0823039a10b27e9cc68309ebaa67d77a36e2bb8595e56a7dacaa79b750c36e WHIRLPOOL 0b0ecd9278905db3126ed5c43534a4436fe4c2e6955dfbae1e399bd6f42353799f3eda7a441b7e2cd8ed17123ea565efbe2c7d13dc97cf28754e982537940c90 MISC metadata.xml 163 SHA256 4539da09a369d01dcec488c471eeaaef71b60686482101eba357344538e994e2 SHA512 44b0091513637625b4b535bbe66410dde135890a60411dcdffc2cfd1750b840bc9655c90b032612ff41499007f45db7bbff28d0874e287ae7411230eea9e0446 WHIRLPOOL 142e95052e96ae05c79dc2e03bb300cc5fcf9a4fa751a55f1f85cad7ab1e597d21acec98517bf92d28a44742b98c7ff0756b660b8e7a86f77e15ed94b6e183a8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCAAGBQJRiPXZAAoJEOSiRoyO7jvoCLsP/iVUENOrV4GClQtduj2JqIj/ -1KUEG3X0vTx/kpehXzNc2Ty4lyaGumlHYBFREFV52jcuHLSE1KlNMO1rVNou7ziR -OjVaVHXPi4MQ5DpWBdhvG+C0+qlNjKDAW8rQlia1MO6h10XyR72iKWqwTb3M2X3l -iG9ASCjglrMcUYm4uKuKHmmcv2EJUmvTH3vjIOkKZ0q7cyiYicCxvVflP2tI/VBQ -0HGoDc5RFEsnDRPzHhO79LutvaN0gnwb7yMHOc5vnyiwN/0H2FAOyEk4YGm6Y+ld -oSu3ntpk92V5SrhG6At0oIuH5oSOiJtKbwfkQuURFJcxBMhtjJj4/Os+dDAhLVbx -mH6I+wRb2l8Q8KENtJBs2emWVbGWc+OKwz52DjrD8xkg+G1zP1U12h4LxwBU+wDa -coCB7rzwTLxlejeHcrM/WQaVZxUJxz7TZwnlVcSCtXY8QTZnxX6G51q3Ap/PjNpP -EpFS6yEYFROOaSZH4hqsKMhTSRTu4Mo9+/jEcSRteFay9R08xrmmwKVvET/Ud+AI -GvbETzHVqQXcQ4HwLfvcziPPv/hPDF8dhOvuqd6eELj7U63XrvYw9lPL0SBvQQga -eVhfDGHEn4ILSb+WUVj402RZQ2B0HmAvU/zH+qBzi4I/zsOpZWK7dCI7TIS9g9dL -Na9i+vERxaVGVX7cPkvL -=9Z44 +iQIcBAEBCAAGBQJRnfL4AAoJEOSiRoyO7jvoARMP/2usQT/tSipJ6m94ZkBZG/VZ +y0js5myCOEl7IbUnW/AoDZsk7dcf4mbC9W5PxS3Oc0gNYniuEfQFOGgZoH1UGbkn +lZEuMNBFl7c4dapwwml8yHnO9vouxvWNb8LrZh6Y2Q1Iyx4ZQWMXIfTHD6bNrGVJ +Cv2BlpPhTLpEmqBhHc6+uAxAjAsMo1IZAUUGgjeZ6POiCTzCAJphr8j04d0zmkF9 +sdExbJCVSdFICaOzmYY0hkVDWcIyD4VXRSevPLFcfI3wyRO0xgArCdPCgtC/FM5t +27npPmjxUMaAohNPxVe1wNjFISAnsxRA2qh3uGBQ/X7EFn2rG+MZlJuv4qTQqd76 +PnD6qetmUQzQJsn9gyMpbWc29wZv5DfSzxId2IFU7vTXH+mInVsg8Z7AvXLktRbi ++w6I/++UdrCROXbHQ1dspI/9XBq28bAEvpwexjHd620GxTf/qKY91AaJ03wjbERw +nV3coztIg5bT+hCKsOr5PYeWi9mCiSHI8npnDTlrzlE6eB7ssikZfOCYyjonrYfd +rmTlb+T0TrEEw1zc/ha7IBlb2w1hlIukDypIEbIlNaVq9SHxFoXwIZa9xovLXAff +ONVIUmN4KzNJ1u+ZfQrMAkoBUZ/dqHgn7pH8J9ALuon70PAJ9E7rPRJwrDx69IkJ +rUKhYHjAv2KHsY+BltB9 +=1IAR -----END PGP SIGNATURE----- diff --git a/app-text/libodfgen/libodfgen-0.0.1.ebuild b/app-text/libodfgen/libodfgen-0.0.2.ebuild similarity index 93% rename from app-text/libodfgen/libodfgen-0.0.1.ebuild rename to app-text/libodfgen/libodfgen-0.0.2.ebuild index 3224665bde28..477544178368 100644 --- a/app-text/libodfgen/libodfgen-0.0.1.ebuild +++ b/app-text/libodfgen/libodfgen-0.0.2.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/libodfgen/libodfgen-0.0.1.ebuild,v 1.1 2013/05/07 12:38:52 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/libodfgen/libodfgen-0.0.2.ebuild,v 1.1 2013/05/23 10:43:20 scarabeus Exp $ EAPI=5 diff --git a/app-text/pastebinit/ChangeLog b/app-text/pastebinit/ChangeLog index 73a7cbee8784..702a6d3a684a 100644 --- a/app-text/pastebinit/ChangeLog +++ b/app-text/pastebinit/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/pastebinit # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pastebinit/ChangeLog,v 1.2 2013/04/11 14:00:55 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/pastebinit/ChangeLog,v 1.3 2013/05/23 11:35:48 pinkbyte Exp $ + + 23 May 2013; Sergey Popov pastebinit-1.3.1-r1.ebuild: + Stable on amd64 and x86, wrt bug #469466. Fix minor QA issue with quoting *pastebinit-1.3.1-r1 (11 Apr 2013) diff --git a/app-text/pastebinit/Manifest b/app-text/pastebinit/Manifest index 32fcf00ca8af..d9834595cab9 100644 --- a/app-text/pastebinit/Manifest +++ b/app-text/pastebinit/Manifest @@ -2,13 +2,17 @@ Hash: SHA256 DIST pastebinit-1.3.1.tar.bz2 35582 SHA256 0dcb6c4820f49cc7f97a7804254df1ae848cfc4fc63e08ca89a525b909709e29 SHA512 f9c4eafbe194dc7fe85ae37005846c38fe9863ed18406953fa6974d979592d74a01eba4dfde3e91da121d36355d87fd2464b565d0eb6aa0091b2b338989567bf WHIRLPOOL 42c58f5cad96361c7f254a17db5a14304ec523b1a50548f27c0a77336e9384f971267a753c1fbc538301dee6cd1d228333976d96618dec8d33539a3e85771525 -EBUILD pastebinit-1.3.1-r1.ebuild 1178 SHA256 308b5811aa4d22494a4bafa5827b169d374cb6a517fcb066cf120f0e1c6375c0 SHA512 ae8af99933fb980d7f9c919b3cbf4a4eaec73d570bb4ed23902857028dd930454ce1916d3d72c3b236ee8f8120999db1b88f9cd2c680b3f820bf9d9a2471ac3a WHIRLPOOL 8e43a7d9e5a1f2871a2d67b8816aaa61786f287a955d8b54884930acd4db01b1d68c457457fb80f3922da0257eec86d48a652834ccdf7e8a72c24e270c4c9661 -MISC ChangeLog 531 SHA256 f75e3072b617e1ef8ac61c5901e884119ce51fcc0a1fd7d82047d7488d70e4b9 SHA512 6f447eaed40e8df1827e13d7eea53e21a5a69534781dc0a070693b14b87d639a895bca5349044428cb284a561c9d840788351dbc07db355741cbcb33ca055628 WHIRLPOOL dbec9c061c7c9d4a3915c95df2b4702b2e74850ee521a462f1e612c0d356094788d0e5dfccd25d6b97af6b9792028f0dd6b49eddc6652892e1e1a8c519df9363 +EBUILD pastebinit-1.3.1-r1.ebuild 1179 SHA256 c5e8f14868e6bb8c66ab25953e457b24ed837421c3b212bc48d3e4368676d935 SHA512 6a628a3e5a83d081cd05a067f59367bfaeafbb794bc8ea7725514793ff28781c549e66a18e5d44fafd0e7f3516752882a7f2612ad6563d43b08474f71c10a857 WHIRLPOOL 30d80c0064deca030063d1131b8f009a0cd6723872d917e99dfa3b9daaf7da7d1a6b7820c490ba830f5114b85b799a9e730c8472a4f04b74882f708e9bde7bf2 +MISC ChangeLog 687 SHA256 71b6b1030fc038d84d7bcff38e4f13b79025a542a02817ba1c324ca42aa6f118 SHA512 f954854400dcb8be4e0fbb4e97da782774e2cde9e2ea0c465025bd6c9fbde92e4522eaef3a08ac9a9ccef89a71060916b228cfb3c73f2d4519410e0bec4b7f4d WHIRLPOOL 2302ff1143cac9588cf085762b324661b438801d7da21af7d93098bd3de8d5303ee6a396d0c756298f5cd36a7a998ff672221909cea60c9909e228de41a77c02 MISC metadata.xml 327 SHA256 167d44a2ab0e99c15035f0b58a6b732f76bed7f13ce199ee7aa57e6e580e7060 SHA512 c8752cd0a231ebe26a30f3d522d987c2c79822f09c5fe3eb33de677bb01d80a093ff4d936cb381fe8dacd3ffbf2c302c7a04fe6d4caf54323d3add54c9a07793 WHIRLPOOL 87dcb731425a13a441d961899b75f3389268714c2858c59fc58f571122fc6e78a5c4bc533dc9c3fa6d58c9a163f5418df95c762f0268b31dd6da8042053e5999 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iF4EAREIAAYFAlFmwhYACgkQmWq1bYTyC0M+AgD9EOgE0s+P+NZ1WMALi82eKzSn -gqLHtgFAkjQXJDEB+6oBAJ7mMnn1E+5i08Y1waTqOjnEsdFFdQN9ijy+YKgcAof2 -=BLwE +iQEcBAEBCAAGBQJRnf70AAoJECo/aRed9267bCoIAJqEOxdYzEGouGHvsoRiH4so +IFvuuT4gC66Cadgdjhc5lRRMJDre0KzRcIHkCukb7cYq6vUwSZA9MTp7LgZq+rct +KUbiybUFXnZcDneKntpp408YEkGH277Yago769Vu5h6XdLKThzl/tcW+UgXB+0M4 +nmn6j7kSEX7qMcX2+vv7PMKIRIpOMOvro2Gqp+AyFYsgY8jbfxyfHNs+GDjlLD7T +GKuZkD858FWPCa2FfgmZbIEzMU2QEJo4gP6IHxPYbf27UIjAU9n56lAWhnCaZS/i +tUWcO0uHrK2lxxgru9J3T/OoCcVJLGuLFFvFPoznMfYeysXMUPmjOFmO7xPGwgA= +=Atnx -----END PGP SIGNATURE----- diff --git a/app-text/pastebinit/pastebinit-1.3.1-r1.ebuild b/app-text/pastebinit/pastebinit-1.3.1-r1.ebuild index dba745d6938e..fc6829656d66 100644 --- a/app-text/pastebinit/pastebinit-1.3.1-r1.ebuild +++ b/app-text/pastebinit/pastebinit-1.3.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/pastebinit/pastebinit-1.3.1-r1.ebuild,v 1.1 2013/04/11 14:00:55 angelos Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/pastebinit/pastebinit-1.3.1-r1.ebuild,v 1.2 2013/05/23 11:35:48 pinkbyte Exp $ EAPI=5 PYTHON_COMPAT=( python{2_6,2_7} ) @@ -15,7 +15,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="crypt" RDEPEND="${PYTHON_DEPS} @@ -26,7 +26,7 @@ DEPEND="app-text/docbook-xsl-stylesheets" src_compile() { emake -C po xsltproc --nonet \ - ${EROOT}usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \ + "${EROOT}"usr/share/sgml/docbook/xsl-stylesheets/manpages/docbook.xsl \ pastebinit.xml || die } diff --git a/app-text/qpdfview/ChangeLog b/app-text/qpdfview/ChangeLog index 3dc742b04c92..abb2c58df2ea 100644 --- a/app-text/qpdfview/ChangeLog +++ b/app-text/qpdfview/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/qpdfview # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.40 2013/05/21 11:05:25 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/ChangeLog,v 1.41 2013/05/23 08:01:27 pinkbyte Exp $ + + 23 May 2013; Sergey Popov qpdfview-0.4.2-r1.ebuild: + Stable on arm, wrt bug #470692 *qpdfview-0.4.2-r1 (21 May 2013) diff --git a/app-text/qpdfview/Manifest b/app-text/qpdfview/Manifest index 30a90e073da2..6fe76e9f2a69 100644 --- a/app-text/qpdfview/Manifest +++ b/app-text/qpdfview/Manifest @@ -7,19 +7,19 @@ DIST qpdfview-0.4.2.tar.gz 341878 SHA256 ab5de31300394834c0540bde9c78ed481ea5783 DIST qpdfview-0.4.tar.gz 396479 SHA256 6191e6ae15f228bce9ac0c58dd5032122fa2986d50f7585859cd64a7fd2b5499 SHA512 da25a10e6e76a6334d403b65b066fc5749fc8430761d90979efe091557097375216b823fe2e6703cc59abd5ae397d9e86b6ccb5a24aaa860cca661d5de65f72d WHIRLPOOL 3bfe3531850e8b41d372ad344203494660f4782887f665837746ed4b03dab647643a053b01b72ce6558800ef19fb36363bc7a7b1f54a4a920dc77b5d4edf1263 EBUILD qpdfview-0.3.4.ebuild 1211 SHA256 b532e94a8af7040088e520b08d9092078dcb91482e2ad4a2ce4cc747de0c03ec SHA512 602703c861df14186172b32ca90cd936d6cf351b575f5f481d8f015385345a48f84949be0b066b70c312544f9f14b38ce2a4b2086e265316516c8f1e6121265a WHIRLPOOL 487258788711328882a4d77ca3ac26e2130c491329ec918aeb70be45016286a60e724d802931bd286dc3c3530e8e48323292a30c104fbef1c4f9b452a43bbc40 EBUILD qpdfview-0.3.7-r2.ebuild 1410 SHA256 c297c02576e889fd3a8f6ba5bf2f2b3e8700271729029ae7631af8b51661df37 SHA512 7117e7435cb152392deac3a5d37cb1bfae494ddd91c501620d1517731e635cc38390a8393daa826e87d6e98c08e07446761153c8199ce1bb21b1c78e92c7096a WHIRLPOOL c4afba5bdb5434a60bdcf49acf995b721143dbeb17b868ad03db3346c179bcc4643ec2fe9d8d6a31a43d53a4e2c9dd21b4be7d305ac405e5b6bd4be211265cf7 -EBUILD qpdfview-0.4.2-r1.ebuild 1586 SHA256 ac6fc841717df73d0cb38b78b8d8748b2f81423ec621d9f1dc470455602c7bec SHA512 463470c8443aeb55417101c0d9016284f6595c4b80719a907a4d45f4291e2998b953b4b445196e73c9aeebbf8a50a00ef9ff9bcedc51ec5051512fb766eedec8 WHIRLPOOL bcb33fde5967b98d794587015e2b678ad45ae130ad41c7c9d9e29637b12c05b8060897c71b23cafe23751f61aee8b98cde8212b4563040a606b0a4fc142a0b88 +EBUILD qpdfview-0.4.2-r1.ebuild 1585 SHA256 01ea99fac46313e6f9b1df96f2ddf1df7025c55dd70e613887b0b98ded88fd7c SHA512 b136379828bad75e166c3ac1d11fe4aaa33b85dbb10509242e72827cdb839c0f36b8d5fc5faec9103b4f464fd51ca4ab17bf30579f9b77a470056f2a872e8563 WHIRLPOOL c46d598171229ee2d2eb8facb856f94dbc22731448d91f5052bbc718fba4bfc53f14bb91b690098fc6f4f7caa11d2358b4df6058611ea6af4e4f3c3361392f01 EBUILD qpdfview-0.4.2.ebuild 1653 SHA256 b1b12e778aff81259217a119434468f1fee425de146d1f1590b3456183655114 SHA512 98696e8edf4db2d914a207583d6755412b59a3217fb3501c63c1fea343be6400dbaff82787291a4cdb7222227059b906bc625e4735047697dfc71a0b9635bb15 WHIRLPOOL ec9f6e90081af72b47f60ed8351774b835cf6a0ab9c2768ecb16e9a9daf09beedfe1ce944cde81d520fb4fd43afbb7ab92787538b99003aea3fbae9f23b23362 EBUILD qpdfview-0.4.ebuild 1668 SHA256 de5d1c33d2d27b66e915e920d92a465e3c89d04a3a1b33dda6dc2006d63380a4 SHA512 8d4c02ae42a0001384593a3cfa5966e5997c2b390bab71e8937b384b8db950986a26b41c2def777f6b11ef1a0352040c7a9e78921566b4cf7228b9eefc548dcd WHIRLPOOL c0ab436a6491060d97d8a59fc055e5a917cb207cd192ede412384890ca7b2e81355d00604c3cb6a8df2c941f0fed168f34835bc7989a28ceffe01554806a2ca7 -MISC ChangeLog 6305 SHA256 ad09a235b4ae2880580afafc739e0617979617d217301547b7d607d050a41c79 SHA512 40ee60430f06612b11d6cb4537fd49b80c56d1bd6e1f10b138e96e95e54e9b42fed8b3875a2cb0a2a821edf57c6c4a585e1ee7f526270b22fba34cd2f2592821 WHIRLPOOL 6550f357cd41cf478c36622fc3bd57274be8095dffafc6f18f9f89aeb1af027bc37d18910b6119a9856133c4328f1048b1f69c519faaecb9a0223255794e0f57 +MISC ChangeLog 6415 SHA256 4d6401ab3a8fb2d22cac5f0c2e5a631cdb7d3fc7340540bd05cd68944dc37239 SHA512 d205e611dfe0670f70ffb342ac7516ef5b81e82509fbd0b70269ac6fadc399b38d0a91deb4df3ac5b354968bf2d808346e80f9aad4e3686d5895e1ba012ea1b5 WHIRLPOOL 6fb8b2922979e274ed431867c5fd007f82eee0cb776589070c5e01a78c966869a12eedfcc6db82fbaa7cea02299b5c6527f7902349a61ec45305343b1ac575e8 MISC metadata.xml 239 SHA256 042eafec556ef46f06d0a078fb4629c43368c2efbcd1cdcb4fee58fe7321c25e SHA512 3eab68188308d5c8d076f348faf795c667f25584cfcc59f72d3a23182f8eac904704611ccbe9182c5fd7adffe107cd6dd1966d189ed3098edabc3ad2f30d831f WHIRLPOOL d44f47ea1b03ee36f38b8bedb0d5c1c02e1b597af6c66d1417bdd26aa8a9aab2ddf1120d4e7688f389993805eb2920307a56e08f3af2f4889ff1e86f9f71239f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRm1TWAAoJECo/aRed9267zM0H/0BqVaxvjgvaVJoXh7ubgS+d -baplVORMl1P1gyUr39m7YxwGJ0ltO/4gZYsdQySc3DfNXuOX2AncriCSCqoSv/gj -HiCt3QXG8G0GUrFQ5ASSx5sStBXgokIxgnPncYyIzrdHxO1zFKehuHrRWCR/Jh1h -QeS5BwfoE68vETc4qB+Rrp4wB7P4/t9tHYakQzPaJpbGAYWf/IWjHmJPaefDBQjI -eJuPn1LQ4fUFs9O7e3oK4hTRPYEDUfL0Eshmx9qnUeARYRnhjuh7FoRstv9JiEaO -S3UFco4dfjNRh9+P8YdcHpjuIj7TMaeq70osm4Jqz7nHIgZE1bo3iz4vsZzvx3w= -=LpJB +iQEcBAEBCAAGBQJRncy1AAoJECo/aRed9267VqAIAIaTRdb+9TS/o1omOG2iWWC3 +U3Ec1UaVwGBzS9q0qPN5KVEKeknkPWwveBjXMK2ag2ACethQLdH351Y18xfdGekl +Nr5O36ye/BEwz0GK6WIeEPO2Na9NfVILVA37tRL4YXZyysNqEg4kIiIeFzeDdzVY +p4q2wLWkyL3GSbVqo+eaNMG3QdKCu7Wb02kCRb6Zu5WkJjcy/fep+OdQ/LU8QTF0 +zP0QjwVWu3L2JNFoI7rrUAYqwoyz8BcIhCBEn4hDr4iKiDW8WZhi2rB87z9ajJAg +zcnfQkKw8pflTM0gWLwJ/5xrHtpHLUSqi++/aZKDgpFPvVzIMDNScX4QNvzAuI4= +=UGM7 -----END PGP SIGNATURE----- diff --git a/app-text/qpdfview/qpdfview-0.4.2-r1.ebuild b/app-text/qpdfview/qpdfview-0.4.2-r1.ebuild index 327f65f5e942..a0c75a3d05dd 100644 --- a/app-text/qpdfview/qpdfview-0.4.2-r1.ebuild +++ b/app-text/qpdfview/qpdfview-0.4.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.2-r1.ebuild,v 1.1 2013/05/21 11:05:25 pinkbyte Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/qpdfview/qpdfview-0.4.2-r1.ebuild,v 1.2 2013/05/23 08:01:27 pinkbyte Exp $ EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="https://launchpad.net/${PN}/trunk/${PV}/+download/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" +KEYWORDS="~amd64 arm ~x86" IUSE="cups dbus djvu +pdf postscript sqlite +svg synctex" RDEPEND="app-text/poppler[qt4] diff --git a/app-text/sword/ChangeLog b/app-text/sword/ChangeLog index 79e2cf130fa1..83969a417dad 100644 --- a/app-text/sword/ChangeLog +++ b/app-text/sword/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for app-text/sword # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.69 2013/02/14 21:59:25 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/ChangeLog,v 1.70 2013/05/23 14:20:33 creffett Exp $ + + 23 May 2013; Chris Reffett sword-1.6.2.ebuild: + Restricting tests wrt bug 313207 14 Feb 2013; Chris Reffett sword-1.6.2.ebuild: EAPI bump, add icu subslot dep wrt bug 455900 diff --git a/app-text/sword/Manifest b/app-text/sword/Manifest index ceb465e4d6d6..f5a657aef986 100644 --- a/app-text/sword/Manifest +++ b/app-text/sword/Manifest @@ -1,15 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 - AUX sword-1.6.2-gcc47.patch 1251 SHA256 3139272398bb95733b14af83dbe1a23dc895df484a073e901073adbe8ccf8b8e SHA512 2c131c963bbf4d181ee31ae5a6a28c0ea93daf3ad42f5a6dd3841edbb328011d2082c550a0311092eee08da9e5aa5692fdb1d02b3d3fb2cb186ee042dd021a71 WHIRLPOOL 616d54a3fc49fa29bd182acab3742850cd91e83c9b59c4153a6313e2d5ac7a0e808065849f0f8c4a1a716b1edd1b3f020d4cd5303bbf8e5fdedaeca97611b3c2 DIST sword-1.6.2.tar.gz 1965427 SHA256 af76c7d54135c444b09eeaafb49229ef5201a4e1d44539d9341dceaeb60a87b9 SHA512 3a62364ce528540a338a163d5fe48ce4a0263c8af6d5a955ab6b5182f122a65130683d6cc6a8eb9fe3a41661d3bd3fe5bf830aa8329c2b8a6d47f010461b32b4 WHIRLPOOL 50fc2cc6a18a269c7f1eca16ed2f659b84ed0a53d520b4e7935bf0af10c96e9c0b2f26c7e3088edf8311564620fb778fc1f63c0b78c449ad165fee9843fb753d -EBUILD sword-1.6.2.ebuild 1855 SHA256 db0dea4a33262c141fe5a32244a722560239bfe34e70f4e813ca410ea8252248 SHA512 eca01cc2918e03de8af2ccaa58ad159decebdcbef5561c181a24806eb6b7be02235f67a7af10afb7689bfbdcab64ab622142f1fe238a14e4ea992e063d0c1ea9 WHIRLPOOL 6c22ff0c9e5bad6a16bc97b98d7d8bb818225044ed36cac1a6e461644c890699a391a3722c3fe76ec7eabaa62a29fa88346b9603dea945392974d74bb3b476c4 -MISC ChangeLog 9426 SHA256 760b41b248657c34c3bc6509bd6c90c9bcfb208e28b2fdcd8031c040abdfd472 SHA512 418731595643bec616f05b8f9e29098383e85dbe6261855c8fecd39c615eae44c5973e2d0164bccd26fb991eea81440b214904585f4de2fef34622854a5dcb65 WHIRLPOOL 4e273bde24a40a6c2e9e3967da1f42c6a9ef324535d33829f3f77d4cefdb8f41331411c4cafb5a3c8eddcb3aab58e0d72f153ea6a5dbfc98355eeac8e1ed5064 +EBUILD sword-1.6.2.ebuild 1910 SHA256 34ba7502fabdacc2d53567bf2c2b607defc4f6f4ec57b47a414bad04a25ab893 SHA512 c80c43229c2f20baaedbc8a82c06086af536c4c5551b5e86be58f64c59a66c871627c6d429220a79ed16f9b92eb5e649a40db07d2a33b4c66f7f26a2416e3b1d WHIRLPOOL b44231c43308239e84b8f6c9db01614ac2caa9e9b60278e29043e592a0bc400c302a1a0319785edf87e7bc3abac4bb8661cf676fbcade243f9c36ab38444ee1a +MISC ChangeLog 9533 SHA256 8130b97da7389acb6ac1edaa9c9827e31c4ca8322761b3ce9e58be04c4dfdd90 SHA512 406bb0e50b5b55951cbfa284fb31e89e0b36751e70ca5773d2cac3cb70ee508c4eba203af3871eef5b77519db0a34b937a5efd8a1b3e79f3039d8e53c8c8430a WHIRLPOOL 0cbb9a601daa0bb94149dfa371aa6424a4631122aedb348555ad15e7b014e370209558e3ae88099acb91f8517eafcbf93b0d44a23e540a32a0bca49bd6fa9d8a MISC metadata.xml 469 SHA256 78fd163e5975551082327b925b0df4f7d26a90a60e3f01911a2a1a74cd990789 SHA512 73c8f05759ff7ca4a6a275d7fbab7d0c120764a3cbfec4829fc1137438cdd8b38ba607b23efdd10de35c547cd938e8dc14b1551110957f9d4dc0e7bc822266cc WHIRLPOOL 3eac7eb0f3087a133b7fad4eae01bd0a5b4413cb60d56bbeac9b2207a9eeaab01ddae231a06ed5e02c33563813dc05d9e1d43e933f524c7efd45dccc9a917a48 ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.19 (GNU/Linux) - -iEYEAREIAAYFAlEdXjoACgkQ23laikJhg1TbWwCfZNXx1TW7tdssZZXBkA3yrfmZ -b0YAnixJL27VB2IjctOYBiZ2M18dO9RX -=CTcf ------END PGP SIGNATURE----- diff --git a/app-text/sword/sword-1.6.2.ebuild b/app-text/sword/sword-1.6.2.ebuild index d103ad867339..418f228ae42a 100644 --- a/app-text/sword/sword-1.6.2.ebuild +++ b/app-text/sword/sword-1.6.2.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/sword/sword-1.6.2.ebuild,v 1.9 2013/02/14 21:59:25 creffett Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-text/sword/sword-1.6.2.ebuild,v 1.10 2013/05/23 14:20:33 creffett Exp $ EAPI=5 inherit eutils flag-o-matic @@ -22,6 +22,8 @@ DEPEND="${RDEPEND} DOCS="AUTHORS CODINGSTYLE ChangeLog README" +RESTRICT="test" #Restricting for now, see bug 313207 + src_prepare() { sed -i \ -e '/FLAGS/s:-g3::' -e '/FLAGS/s:-O0::' \ diff --git a/dev-java/icedtea/ChangeLog b/dev-java/icedtea/ChangeLog index 3130d993d3da..cb4df7bd1067 100644 --- a/dev-java/icedtea/ChangeLog +++ b/dev-java/icedtea/ChangeLog @@ -1,6 +1,11 @@ # 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.94 2013/03/17 15:26:36 hwoarang Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-java/icedtea/ChangeLog,v 1.95 2013/05/23 05:45:35 caster Exp $ + +*icedtea-6.1.12.5 (22 May 2013) + + 22 May 2013; Vlastimil Babka +icedtea-6.1.12.5.ebuild: + Version bump, security bug #466822. 17 Mar 2013; Markos Chandras metadata.xml: Add proxy-maintainers to metadata.xml diff --git a/dev-java/icedtea/Manifest b/dev-java/icedtea/Manifest index b87f0d00e808..00f6187283c7 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA256 +Hash: SHA512 AUX fontconfig.Gentoo.properties.src 15602 SHA256 d48a9b43d82f45425464e985955f3f3700738a98c0dc97ab7577230ca11fe647 SHA512 eac3fd310bf0757284a4a0c3c72759a8516bd2d9b8f9d9c7df10ff15fd291833d5adb5429b166175c6f333c883974d56fe7d0339cc16db3a5786a77780217a39 WHIRLPOOL f9f702848c38ef9cca0577f1db5a7c4cd6847e79d205b8e855c14b3a80070328b12fdcd854f5bd2dcf07c7cb9bd2aaf433a770a0752ec01a4e8b308dedf3bf19 AUX generate-cacerts.pl 11051 SHA256 6ee6fb155e3fa85d0a7e9015b53ebd55948c6599d100fdb69b574b6d11f73433 SHA512 22d1be675362c09ed61af4dc3ece14cab81e9514937d588ff5d324e61b7eba7d3dd99b26bc5ec0953365de56d099f708b2afdb13cca37bc4ff07fd8ce31fbe97 WHIRLPOOL ad0e7946b1f055542f8a76b1050ae841bc7b6498305def9881d2f5d2177a82b77d25bf20e97488e2c84bbe0c3834421caea7e5bf4ea990c783908bc19133e619 @@ -13,33 +13,25 @@ DIST a152dced63a1.tar.gz 9393091 SHA256 eac2313e3012653afa7549257765d56e4348c775 DIST a567bcb7f589.tar.gz 4263355 SHA256 d49f79debc131a5694cae6ab3ba2864e7f3249ee8d9dc09aae8afdd4dc6b09f9 SHA512 2abbd6ad72a5811963610b81ad3f59882fa0109bbffb69316f7bcadd218982abbb7b94ea41ddd379a0dad8586301e1d317226153d2f592876c56e7d338afadf5 WHIRLPOOL e712ee17b9e4e23a1fe54823218a79a45ab1ca11e23de2896b576a2034650bf8b151f01022e0d3f12421008fc1e8d8f9aa0bfc4cc6bce812dcfbbbab1c66af7c DIST deac45dc94f0.tar.gz 44996399 SHA256 00e3e4cb436f4153434faa2d1063114a9028e9c8a7eacf558873053c47365215 SHA512 f9a4a0d910285667e84f48562f44f9c27c006d41c0e97d376b1d39258cedf38108eba07c99260f18be7ec6f07cfc8f40ada4b9f8f1452ccd92b67e49f06c2e3d WHIRLPOOL 63a9548e3eba0b1733f6b5cb6a91d9b259d94034ffc1a4700035d976e601bb43640056980fecb01cf5e138b736ec8507281747b8c5cd68c82f5b4e3a1079c58d DIST ed02a059ea15.tar.gz 131499 SHA256 865030303330856c988e353bf1bc86fc95669179b0958a4072538fc59d9a073b SHA512 4a9fa5c9318a67255ad39377fb3ce861b6f6eaa6427edf06c7a4f19d11e46dc30b2f1e847d3ea1def41304c59dddd2eeaf97d33659d276d7c33b5b9ac390e6d3 WHIRLPOOL 35b55ed80c567d5d347417564a7d340ee62711f411146644da979f69ce7ace1b8b7a68950d932e8f59856d7816fcba8b38d5e893c4cd1915099bdf50f4116e3e +DIST icedtea-1.12-cacao-68fe50ac34ec.tar.gz 4263528 SHA256 b8230f20d7022f9230bbfea13b2f3f179b2f42db40138ac6d32c82fc418ffc3a SHA512 bfa719e5c0212435bbc0e3abc7c69d84b52b17edc1571df94f13e4183889da07c82bb332745724cfa4944e18034c71fd9383e3c4515a69dbfa1369ba9318231f WHIRLPOOL 539c0fed1057723212b209d4341ece9c6b2786b1c216789ebdb8d22b4339daf26425883bbc2f08ea754252c28259f02bc829a42ec05d6838162232066f0ec0a3 +DIST icedtea-1.12-jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz 298435 SHA256 bfa706402ac934d24f7119eb78f6be65e91439a4b2e49dbcc21e288137808f03 SHA512 fa3428d8997f9696cce4fa32c9de677ef193bc12236ef8b431af647b57d26725f4a3019abc87ade0cf10c7d6a745c18eb78e8e126d6842e788c8cefcbd2b006d WHIRLPOOL d1ca7dc677b7abbd600262f30c2c3774f502ef661f3dca60d4664c87b50b9a90c808e106f607a1dde7b3f4cf44a7a4a9e647877a2cc3332866b6b2bd34eb2a2a DIST icedtea-2.3.8.tar.gz 5053426 SHA256 750a4c6e3e22369aa7dcfb0751fe85d5ea7a36b32871861c5063dbcadddc7153 SHA512 2ecc4b71b167a71789dfc099225df848c6a8763ae15d1b9396ce4c6068b7d7d6e9a428b09d1e2c99e013650a7136a9d1457979b8d1a38d74ca22817e31716b7e WHIRLPOOL d79e964e83537ddcaa2161614f6b78564f36fc28db751dc599b031ef35d85b9f4a3b801c8e288248a8759645745f3a408652abcf19668a33f9a4a92ac9058b59 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 DIST jaxp144_04.zip 5976385 SHA256 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c SHA512 9090d37f62f57d3dd8fb5981e3ce4a1ae87f1ef19abdb9df4775df1a48419cd16016c025a65516cfe3329885ac164cc45e4204dbc8d03239d368ebc962c824a4 WHIRLPOOL 6646fc6cfc83fbc26aef79cc219e008ee28fe4cf649ec4fc0e5bff045dd76b737c1036631acc9439137a50c2ee33dc7534b2de914877d1b695a3741ca3e6b1c8 DIST jdk6-jaf-b20.zip 71243 SHA256 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012 SHA512 22fef9e0fdde82f141151d426d26316d7c23fd4cc2132ef191f38ea9420ebb3126670b0456ab4de83896307eab48bab0c46aaf0485f39e89cb57dac3215d499a WHIRLPOOL 2b02e883c7a2341ce927f402a9abc5a632a6718f713fbaa5c65133a0ac81a1a58a317b7e2028c309196805dc43146c591852c05144c64f2428938cb3ec4972d2 DIST jdk6-jaxws2_1_6-2011_06_13.zip 5512710 SHA256 229040544e791f44906e8e7b6f6faf503c730a5d854275135f3925490d5c3be3 SHA512 643266da495f239aca1a08ba85af337e5ab50e5b859bffbccab64cf1c4099cae641d9741a20ca59c599c1285266a79489dec190d7fb15daa88c82b69ce97dbd6 WHIRLPOOL cbd0614060d887ce5e1ee6aefaa213265ee45ae11b3f0f90eef0cfa5ee5db1c35d8209bf1d2dab6f5966af22ab14312891081cfa6ca4a11de92f272f33a2ea20 DIST openjdk-6-src-b27-26_oct_2012.tar.gz 45789350 SHA256 044c3877b15940ff04f8aa817337f2878a00cc89674854557f1a02f15b1802a0 SHA512 4198f11b2f49c9bc5ffbeadf2d0d87dfa413a918d49faff3a043266bf4a2fa99579fba3c6d75164d87e88b8fc5c97c3c1527560eb25c55cdd42ad813c8e175e8 WHIRLPOOL 5038258710f2c0eac1a5a1957629998d931d49a6145450485b84e21988d8fdfa5127dc0852067319fb2ac054f621ec511c0d8e01961943c7e4a223049317b894 EBUILD icedtea-6.1.12.4.ebuild 9777 SHA256 27b401c55d14db7eca1c72ea0a952fc4ede7b34fada336d0438bca9549c59958 SHA512 1698ee5c706d85dc526abc8a0ea703883ee651b00b79d4d45582b1b60919e053ce7796746c9d35dbb9e5c858363cd2b54e862305d162d3ef83e41a490c3b285b WHIRLPOOL f8905278b97e72d13ad2be68c750b20145896972e47b3c0ed44380eea8184309d7dc159fd2e6897229dc88e1993a8f296712fbe8b9f0f53e404cf24e6e582734 +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 -MISC ChangeLog 21559 SHA256 12f7107cc876a096890d2702b02c5a6278b93a0439665951e085acfb70f62678 SHA512 8632c6de70f54d3f8b87ee11bb6af8e1db4ab3daa1c18170efa2639236c24665115412581e4f6e8b9e26cc95d2ac63c60e9468b21b00912158a3f67085808ba0 WHIRLPOOL acaeef649122c97d3cde2f2dab91785c4b5dc93322a49c05543980149f59ab54f4d1f2e07bd6fc39ff1bc6868ba68c58b5061eae46afea340692755c9165d6fe +MISC ChangeLog 21706 SHA256 4f7c9e91e5ff33686101eff2033369144fc295cc89fe237e966e18d48984db43 SHA512 ccc209d36314b1d429f4df40a89c0d68cec64b521140713290d1b1057a4675a56508d5f1a5b62f84b37f94b336e4ecb074ae2de7c45db39cb9e4119d20a94282 WHIRLPOOL 7250150c113466887bdce8718802c32ae54bdac7b06938626a46489a52b17343729b48f9629b5add47d5fd51755b532159792e2e7da5a601894cf76679a9c678 MISC metadata.xml 1524 SHA256 bbf85ab93611dba9d16ddb6f9889af231a9420a857b4c2b7360320a53b3dde1b SHA512 e1ab2d668de0086a5bda71a8323da63ae90e233a10df0af3eda9a2f2162a92a65e8a93ab8d752599b12e9b1dbad3776fbd86a01b38c59b9d60ad221c6779ba60 WHIRLPOOL 0ddd7461553ae3612ee53f1403dc66e17ab03428bd6eff7de5e3ad2db3d971cadc8be62b6fa0426733bd7ef5e4da9d2f0a9c04b0a97ede7bb908e14ec5141c01 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQJ8BAEBCABmBQJRReCtXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w -ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw -OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88vLUP/iZLdpcORV42nSm+thNOQa7k -31406l5hCFIMSctESL9GBEHMQawhHNjIodZ5fyR/XjPyo+oMX9GVBnjiJQEktj59 -dA7/Utt7D+sEED/uUFcxQuxyRofaNorFcfqp7w4K3m8bZGlWrWqbofyPEsm9RVcM -iPOqDFw7SU8PJ6I0iS1/xRaKiQglOIsKUgtM2jIiur3CgKtWKdNkq3Rm2FiW/dX8 -zdS9EnbuXbHcJWZ1T8T93oHEtqsixYUTnh4kthoAfuH3jreF+zkAPApnSzjVEccB -3aSBGkV7KK6lT/gYrcmv/Sq7wtq/9btmEW+wX0/f8PyV9/pfd65+YJSJaLmVRCAq -8V6pzjPKjzV6QqBmErQhtNJ7ENs0Jc2RnF+yIg/Wjiq2DosdrPlwXrJtJR5CC5Ec -5m+OBNzLP0Vdg7aEYQsCL+VqWRblwA/uMCEyIk/2UHRiYaxg8Fkxiie85+ybkEi6 -qyfwQVZuRWEZOqnXjpaZ1ickdfPx8WSMJoHqCmM4ZdH316Mk2LUQVfA8pK+Srnw1 -6ehSwHrBkzFR+XEf8yZZFi2mhnIVQKDSlD0NoEYRQ9GjF5x5RlG0LPDiRSDrAGnJ -e7K+gTD8C+PrLGb8dboUQ1+Mm1cBDunBXojNO3w/d8GhtEDO2l1mGFpTsUc9BxAF -0T1iAJjlCK1/ov28f5fk -=Lku6 +iEYEAREKAAYFAlGdrQYACgkQtbrAj05h3oTFwgCghxhDeFeDZBOk2DEOTAMcR1uV +KwoAnieYFFyNzaInA1vbWpk/YQyKI3cZ +=yo8b -----END PGP SIGNATURE----- diff --git a/dev-java/icedtea/icedtea-6.1.12.5.ebuild b/dev-java/icedtea/icedtea-6.1.12.5.ebuild new file mode 100644 index 000000000000..4aa6c06b7ba2 --- /dev/null +++ b/dev-java/icedtea/icedtea-6.1.12.5.ebuild @@ -0,0 +1,311 @@ +# 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-6.1.12.5.ebuild,v 1.1 2013/05/23 05:45:35 caster Exp $ +# Build written by Andrew John Hughes (gnu_andrew@member.fsf.org) + +# ********************************************************* +# * IF YOU CHANGE THIS EBUILD, CHANGE ICEDTEA-7.* AS WELL * +# ********************************************************* + +EAPI="4" + +inherit java-pkg-2 java-vm-2 pax-utils prefix versionator virtualx + +ICEDTEA_PKG=${PN}$(replace_version_separator 1 -) +ICEDTEA_BRANCH=$(get_version_component_range 2-3) +OPENJDK_BUILD="27" +OPENJDK_DATE="26_oct_2012" +OPENJDK_TARBALL="openjdk-6-src-b${OPENJDK_BUILD}-${OPENJDK_DATE}.tar.gz" +# Download cacao and jamvm regardless for use with EXTRA_ECONF +CACAO_TARBALL="68fe50ac34ec.tar.gz" +JAMVM_TARBALL="jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz" + +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://download.java.net/openjdk/jdk6/promoted/b${OPENJDK_BUILD}/${OPENJDK_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="6" +KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" + +IUSE="+X +alsa cacao 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/glib + >=media-libs/freetype-2.3.5 + >=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" +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/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 )" + +# media-fonts/lklug needs ppc ppc64 keywords +RDEPEND="${COMMON_DEP} + !dev-java/icedtea6 + X? ( + ${X_COMMON_DEP} + media-fonts/dejavu + cjk? ( + media-fonts/arphicfonts + media-fonts/baekmuk-fonts + !ppc? ( !ppc64? ( media-fonts/lklug ) ) + media-fonts/lohit-fonts + media-fonts/sazanami + ) + ) + alsa? ( ${ALSA_COMMON_DEP} ) + cups? ( ${CUPS_COMMON_DEP} )" + +# Only ant-core-1.8.1 has fixed ant -diagnostics when xerces+xalan are not present. +# ca-certificates, perl and openssl are used for the cacerts keystore generation +# xext headers have two variants depending on version - bug #288855 +# !eclipse-ecj-3.7 - bug #392587 +# autoconf - as long as we use eautoreconf, version restrictions for bug #294918 +DEPEND="${COMMON_DEP} ${ALSA_COMMON_DEP} ${CUPS_COMMON_DEP} ${X_COMMON_DEP} + || ( + >=dev-java/gcj-jdk-4.3 + dev-java/icedtea-bin:6 + dev-java/icedtea:6 + ) + app-arch/cpio + app-arch/unzip + app-arch/zip + app-misc/ca-certificates + >=dev-java/ant-core-1.8.1 + dev-java/ant-nodeps + dev-lang/perl + >=dev-libs/libxslt-1.1.26 + dev-libs/openssl + virtual/pkgconfig + sys-apps/lsb-release + ${X_DEPEND} + pax_kernel? ( sys-apps/paxctl )" + +PDEPEND="webstart? ( dev-java/icedtea-web:6 ) + nsplugin? ( dev-java/icedtea-web:6[nsplugin] )" + +S="${WORKDIR}"/${ICEDTEA_PKG} + +pkg_setup() { + JAVA_PKG_WANT_BUILD_VM=" + icedtea-6 icedtea-bin-6 icedtea6 icedtea6-bin + gcj-jdk" + 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() { + # 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 enable_cacao + local vm=$(java-pkg_get-current-vm) + + # IcedTea6 can't be built using IcedTea7; its class files are too new + # 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" + fi + + config="${config} --${bootstrap}-bootstrap" + + # Always use HotSpot as the primary VM if available. #389521 #368669 #357633 ... + # Otherwise use CACAO + if ! has "${ARCH}" amd64 sparc x86; then + enable_cacao=yes + elif use cacao; then + ewarn 'Enabling CACAO on an architecture with HotSpot support; issues may result.' + ewarn 'If so, please rebuild with USE="-cacao"' + enable_cacao=yes + fi + + if [[ ${enable_cacao} ]]; then + config="${config} --enable-cacao" + fi + + # 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_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 \ + $(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 + + # Load the least that's needed to avoid possible classpath collisions. + export ANT_TASKS="ant-nodeps" + + 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 + + # 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 +} + +pkg_preinst() { + if has_version "<=dev-java/icedtea-6.1.10.4:${SLOT}"; then + # portage would preserve the symlink otherwise, related to bug #384397 + rm -f "${EROOT}/usr/lib/jvm/icedtea6" + elog "To unify the layout and simplify scripts, the identifier of Icedtea-6*" + elog "has changed from 'icedtea6' to 'icedtea-6' starting from version 6.1.10.4-r1" + elog "If you had icedtea6 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 +} diff --git a/dev-java/jfreechart/ChangeLog b/dev-java/jfreechart/ChangeLog index 4ec4170cdf81..3ca4ca30d327 100644 --- a/dev-java/jfreechart/ChangeLog +++ b/dev-java/jfreechart/ChangeLog @@ -1,6 +1,15 @@ # ChangeLog for dev-java/jfreechart -# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.52 2010/01/16 10:47:56 betelgeuse Exp $ +# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/ChangeLog,v 1.53 2013/05/22 13:10:16 tomwij Exp $ + +*jfreechart-1.0.14 (22 May 2013) + + 22 May 2013; Tom Wijsman + +files/jfreechart-1.0.14-build.xml.patch, + +files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch, + +jfreechart-1.0.14.ebuild, metadata.xml: + Version bump to 1.0.14, contributed by Andreas Sturmlechner (genstorm). Fixes + bug #460952. 16 Jan 2010; Petteri Räty -jfreechart-1.0.9-r1.ebuild, -jfreechart-1.0.10.ebuild: @@ -227,4 +236,3 @@ 30 Jul 2004; Thomas Matthijs +metadata.xml, +jfreechart-0.9.19.ebuild: initial import, 48316 - diff --git a/dev-java/jfreechart/Manifest b/dev-java/jfreechart/Manifest index 9eb1797478c7..ae87b44eb5c8 100644 --- a/dev-java/jfreechart/Manifest +++ b/dev-java/jfreechart/Manifest @@ -1,6 +1,24 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA256 + AUX jfreechart-1.0.13-build.xml.patch 2919 SHA256 4969addf776a91c81f853d830fb3fc12fe6bb255610b3fb2ad07c043dbad9f2f SHA512 e8c9c2ba3bad8dfb7dded05a14c8166cd9af5733ee630f5e556011fbbb106b8ede19d20ad43aa34d2e6bd0a32dbcf3606e0ee5bcee49ea9303f63cbd405bf720 WHIRLPOOL 524fa81a1bdd859de21958325277985a93e5b625d1bb9384ad37e156d019d38350717c84eb702072aff65c028eac2a39868b5dbd3dc48e4888f20d1ebe2abff5 +AUX jfreechart-1.0.14-build.xml.patch 1344 SHA256 6e3cbbf4e20d7bb875918d770e6e5c74fa8464e7c02eb7f9e282b3ed30ddd655 SHA512 e72381bc3fae04c4943adad94e1ce810d2752e4ba5eba81f3cfe400ccadddb2a10c904629c01854677c6030ff8a6fe7ca146a28b324b06c0d2d2f262de2bc29e WHIRLPOOL f3a846f50163362d3f8a19977eda33ea35de57c15fd344096aaf87f354d815478326dc88ef93b23368b4c12549f7d2bb63d84d45f7cc281fe6c993439a20b15e +AUX jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch 1169 SHA256 b417b3bbc1cb26a023e2c318eca05dd52aead8ff740d4d5bb97e784298c23671 SHA512 5bfd978a90d94dafa1c8c8c8f8c58fe8a85ca25b530f49fd1c9940d9ee191cb2bf90606db569e70043bc54c0ca6d25d0825d276b45fb8c0f47030a17e42df30f WHIRLPOOL 66346b7e0658d9087466ec4300aaecb33a9a38fffd792afe4a6e4f5a2cc09c41916797c1c002c3a297de6cf345f4a42162bd66ed1d5b51cabba3b090e8f02a73 AUX jfreechart-1.0.4-build.xml.patch 396 SHA256 2f94895138b874ac2e5023e17eb6bb4daccb3e9eb709c81c5e908ef20fdd57d9 SHA512 6634f89711ec650eda5f94f6353081db2fab99137deaf105258a68121e8bdc0be37c3060caa021712eae7692ebb96029c3b14f05cff2e1ad1192d0e8ac4bcbd3 WHIRLPOOL 081e550aa0d593dd6e956cc86ed204b63279e485eed529b23741799321be6c2f2d89471c7bbc3f930c6443a3c766423b5da8e01e045ef0bc092837ee5a959dd4 DIST jfreechart-1.0.13.tar.gz 6306139 SHA256 8b8286cc86d898961f307bcba1f8b6f6471bd0e921562adf573f2758b090c175 SHA512 6b4e2079fa4eb4cebec709a95e7b1bff4d7233dbdd26c7e3173e75fc29facc9accc64039a62e5d89c83c3aedbd9cd9bc42d5de79f77de08d7027dba8ba9a4d68 WHIRLPOOL 0dbf55f4b53687eb31116c9ba6ab556296a7f915ffc859ddda739ca2bf633e31da6c692289a08859a315e7cb53e571c54fa117d666ed9ca3f789c891597444b6 +DIST jfreechart-1.0.14.tar.gz 6376551 SHA256 9250d0ab465fed67aa6f48090854258d9d0053f519ca534e267a8bb84a6727f2 SHA512 4d2344553032aa138143d88ad91942ffc66385d90b3d8f279f4257ef2273012580e99a60107baffefa3ea4e33cb0bad9e656a42747a4d0132642d5b9cb27da7b WHIRLPOOL 13cd39d4f287291eed725ba0229f44187b63466348c347c7acb0e6137d3c638136d1d973e8fdac31c7aec32793bf3864cc339df01abf0588763a77052a351e4d EBUILD jfreechart-1.0.13.ebuild 1843 SHA256 5f6a1a7e98fbfd2e44b37d07c35e50eb15637ecadb12ac164fd06b5a3d07c8fb SHA512 5c6dc360bb22f4fd00dacb17b820bdace08c41da967543c5678216f3ec256ea2ecd7e65de091179c6a8be60e48e6b6bf875a14e46476eb1c02877c3cf53936c9 WHIRLPOOL 5afe9fce735b198c431bafd5b620d9b3d448ba958efc71a5ade13b011e6549b5f3eccad549d1c1a43059a4bc7344fe25d2eaa0f96be69ab1968715f2d2f1ac28 -MISC ChangeLog 7795 SHA256 0512c4c884205dbb96a7b06db825e7c058048c16081407da33200fa6cdde818c SHA512 b86646c31cc1e895df658451dfb37f28affe2a20e61ac8274fe3d9bca56063866592e23eaf9db3dffd96b8a095274c16a9dc01974a1e5966bc887ff7d70af800 WHIRLPOOL 8244f22762bed22c466920948fbbc33c8627af6bc23c3dce88cf557abe07403cb1bf8a03f63c3369fec561f6bd9b1ac439e2e68628a596f2af5d1257084f94f0 -MISC metadata.xml 157 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 SHA512 bbae663e26f48fdc5e272adc2b06c14f77f34c53caf84acb53908ff036e7c12a3edbbc0929d2db56bee861a453381d979c7e0983a23716f629ed2135c22ffece WHIRLPOOL 887e153e2481e7d76f0f1b67a395f10f0328b93930185ecdb8fcb5fe3c50f839086a18831d61cf45b34657aaffca6c3b7900cf3c04b712846a05027a84602448 +EBUILD jfreechart-1.0.14.ebuild 2148 SHA256 94b674b7402ed0dda668ea9547c366b8afee54639549bfa425dccfc804487d5f SHA512 f377c028247e80134b6b03049874801808b10cc5633791420bf6c01291bc6b339d980c92bf6dd3dceaf6bc3035cd91f88e63f5e3f58531c949d16e5df85aedd2 WHIRLPOOL b0361e96951dae9d97af49ea4aacf4655bda1dc41ad596fd3331c0e0f6a643a7263277d7f40f4e1900e6bd57409e8b7b8d71f4cb8c097a5a2bcf250e4a2f132a +MISC ChangeLog 8118 SHA256 a5e97a22efe565a962db605094150c20c8bd6c19ced07a3dfce2bb3cbf171cac SHA512 27dbe8be0955cc30b70b3a4a2f756646ae5937fb7e789d54654b87ab600160ed513bf151d467c1a1486912ff0e601988e7c78ac96a568b3feba7abb75b3cea63 WHIRLPOOL 97e2c5a73f25a28720f97fe4b320907456f89c13b9a2cfba91d5abd9d8daea94091f42ac5286d4d7badead96b554ff2b0d3c188fa04f061088122c155a1c0fc7 +MISC metadata.xml 239 SHA256 b2a6244ef3f3b6f51b8c4389815ea60713c6dd0758b8a64bf9b3c5a03bc06873 SHA512 06769efd2b3f33e77c910d4f3509f1657d90e772b0751c901697ec8044cf5b8a3c64c4c4d30e786c5939c17c72889e4885d9a36d97ac3e15c829f2a086b8f7c2 WHIRLPOOL e4f6f9c71b81271cba96f24bcfa107bc1d7492519e18d5bd42792e53bd70bc1387b479ac17ea9a993c4ad96fc2ea2fb81d367f7baf86dfc9cf19d94d5ea8f8c9 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iQEcBAEBCAAGBQJRnMNOAAoJEJWyH81tNOV9mHEH/0G8g59zjjbinP9EgmYjIIch +84lddDOigVUWwbKg3F1ahvhvWoqp0VUV/rQ0sPcMLB+nziQkMSvTHN1vLYlqqKVC +O53562rK5ITBUBeaF6VTfgD0/2V686+NTPqbv5jVoiwdFvubX/LqFLDGVdiP8sIN +SeGVp6vc5A5B86wXhFdIZoJCRZw7Uk6u2CjrYeSL441gqdEJVr4SBhCIedO6HZh2 +QyrSAqB3xaUW6HlpXeQhgSCw9xBM/JS2hYFzWq1UelBCpspT8dxSXQMcLQXhfZF5 +Ao0ISUtf6vHDh4yo9wydDbyGqBfeB7CFQdrNnQBlZUXP37wDsvBbZUQ19ir7Dzw= +=wgY+ +-----END PGP SIGNATURE----- diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch new file mode 100644 index 000000000000..f07e5be5df41 --- /dev/null +++ b/dev-java/jfreechart/files/jfreechart-1.0.14-build.xml.patch @@ -0,0 +1,35 @@ +--- a/ant/build.xml 2011-11-20 22:40:13.000000000 +0100 ++++ b/ant/build.xml 2013-03-09 14:10:53.987970148 +0100 +@@ -40,11 +40,9 @@ + + + +- +- +- +- +- ++ ++ ++ + + + +@@ -321,7 +319,7 @@ + + + + + +@@ -354,7 +352,7 @@ + + + diff --git a/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch new file mode 100644 index 000000000000..b932d863bf83 --- /dev/null +++ b/dev-java/jfreechart/files/jfreechart-1.0.14-fix-TimeSeriesCollectionTests.patch @@ -0,0 +1,24 @@ +--- a/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java 2011-11-20 22:40:13.000000000 +0100 ++++ b/tests/org/jfree/data/time/junit/TimeSeriesCollectionTests.java 2013-05-21 00:18:03.840041846 +0200 +@@ -339,6 +339,10 @@ + * java.util.List, boolean)} method. + */ + public void testFindDomainBounds() { ++ // store the current time zone ++ TimeZone saved = TimeZone.getDefault(); ++ TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris")); ++ + TimeSeriesCollection dataset = new TimeSeriesCollection(); + List visibleSeriesKeys = new java.util.ArrayList(); + Range r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, +@@ -351,10 +355,6 @@ + r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true); + assertNull(r); + +- // store the current time zone +- TimeZone saved = TimeZone.getDefault(); +- TimeZone.setDefault(TimeZone.getTimeZone("Europe/Paris")); +- + s1.add(new Year(2008), 8.0); + r = DatasetUtilities.findDomainBounds(dataset, visibleSeriesKeys, true); + assertEquals(1199142000000.0, r.getLowerBound(), EPSILON); diff --git a/dev-java/jfreechart/jfreechart-1.0.14.ebuild b/dev-java/jfreechart/jfreechart-1.0.14.ebuild new file mode 100644 index 000000000000..33169ea439c0 --- /dev/null +++ b/dev-java/jfreechart/jfreechart-1.0.14.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-java/jfreechart/jfreechart-1.0.14.ebuild,v 1.1 2013/05/22 13:10:16 tomwij Exp $ + +EAPI="5" + +JAVA_PKG_IUSE="doc source" + +inherit java-pkg-2 java-ant-2 + +DESCRIPTION="JFreeChart is a free Java class library for generating charts" +HOMEPAGE="http://www.jfree.org/jfreechart" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" + +LICENSE="LGPL-2.1" +SLOT="1.0" +KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux" + +IUSE="+servlet test" + +COMMON_DEPEND=" + >=dev-java/itext-2.1.5:0 + >=dev-java/jcommon-1.0.17:1.0 + servlet? ( java-virtuals/servlet-api:2.3 )" + +DEPEND=">=virtual/jdk-1.4 + ${COMMON_DEPEND} + test? ( dev-java/ant-junit:0 )" + +RDEPEND=">=virtual/jdk-1.4 + ${COMMON_DEPEND}" + +JAVA_PKG_FILTER_COMPILER="jikes" + +src_prepare() { + epatch "${FILESDIR}/${P}-build.xml.patch" + + # Fix test failure, obtained from + # http://sourceforge.net/p/jfreechart/bugs/1100/ + epatch "${FILESDIR}/${P}-fix-TimeSeriesCollectionTests.patch" + + rm -v *.jar lib/*.jar || die + + if ! use servlet; then + rm -rf source/org/jfree/chart/servlet || die + fi +} + +src_compile() { + # Note that compile-experimental depends on compile so it is sufficient to run + # just compile-experimental + eant -f ant/build.xml compile-experimental $(use_doc) $(get_jars) +} + +src_test() { + # X11 tests are disabled using java.awt.headless=true + ANT_TASKS="ant-junit" \ + ANT_OPTS="-Djava.awt.headless=true -Duser.timezone=UTC" \ + eant -f ant/build.xml test $(get_jars) +} + +src_install() { + java-pkg_newjar lib/${P}.jar ${PN}.jar + java-pkg_newjar lib/${P}-experimental.jar ${PN}-experimental.jar + + dodoc README.txt ChangeLog NEWS + + use doc && java-pkg_dojavadoc javadoc + use source && java-pkg_dosrc source/org +} + +get_jars() { + local antflags=" + -Ditext.jar=$(java-pkg_getjar itext iText.jar) \ + -Djcommon.jar=$(java-pkg_getjar jcommon-1.0 jcommon.jar)" + + use servlet && antflags="${antflags} \ + -Dservlet.jar=$(java-pkg_getjars servlet-api-2.3)" + + use test && antflags="${antflags} \ + -Djunit.jar=$(java-pkg_getjars --build-only junit)" + + echo "${antflags}" +} diff --git a/dev-java/jfreechart/metadata.xml b/dev-java/jfreechart/metadata.xml index 838c00a4a448..83759310c990 100644 --- a/dev-java/jfreechart/metadata.xml +++ b/dev-java/jfreechart/metadata.xml @@ -2,4 +2,7 @@ java + + Build a servlet using the servlet API. + diff --git a/dev-lang/R/ChangeLog b/dev-lang/R/ChangeLog index 6b19863445b2..df29c70a1df3 100644 --- a/dev-lang/R/ChangeLog +++ b/dev-lang/R/ChangeLog @@ -1,6 +1,11 @@ # ChangeLog for dev-lang/R # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.215 2013/04/10 07:09:19 patrick Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/ChangeLog,v 1.216 2013/05/23 14:58:48 jlec Exp $ + +*R-3.0.1 (23 May 2013) + + 23 May 2013; Justin Lecher +R-3.0.1.ebuild: + Version Bump, #470858 10 Apr 2013; Patrick Lauer R-3.0.0.ebuild: Force emake install to -j1 to avoid spurious failures #465352 diff --git a/dev-lang/R/Manifest b/dev-lang/R/Manifest index 33101340bed1..811db9ea65c5 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -1,3 +1,6 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + AUX R-2.11.1-parallel.patch 633 SHA256 4ad6f007ffb390584de0c8a5935e98f98106f32394aac45c30c3fdfe77c00c70 SHA512 788eca6236dccaf3fd6a13387c167bf3b11625b32c5b658fb19b17521d8e2747170cfaa54eaca3a4703a89e1f9453399e013792f7f92e7e9d0adeafeefb7e6da WHIRLPOOL a8ebf8ea01406fe576d2f95d57efc1f3c42d9ba61f75bd1034f485c85e68576cdd1c46c5d0e3139b5de8da312c20e89c78d97395082b4ff821fde4248a1b2b58 AUX R-2.12.1-ldflags.patch 639 SHA256 dee11fd510d31add8166230a7af61b7e700f2f4f122cbe0a07310d0017874933 SHA512 49b73cff79c1521e214f036390f32eed8c7d4afd39082eabb7e6c59e5d7136f399ff7227117e418d4445647d25259dce8eb208a1ebe5990bf4ad87cefa250338 WHIRLPOOL 98ec264ac6d68e64dcbce32f4688aa458ba6d300202b6f31cd7580de68c693f0fb6aecba40cd0f6736a0ef9ff346d04cd96af06716a25c4a84a72551085837ed AUX R-2.13.1-zlib_header_fix.patch 464 SHA256 161f0fff63db5cb2cb4894321759997e75463d784d5a7ba5105f74fe2ed73c40 SHA512 7d573f33f16a9cfe080976e32fae1cb0af50e02bef026814aa5d30ce5a37d79f0ddeb69cee817602de40968fc3d5aee2ee4681b15d4011afc61ad69a01705f17 WHIRLPOOL 30d34d6e3c3a39f395409f238f6469b0c096db5039df377c8668678aaf4968f704205202f5c4f63cf8c5e3607b15df83172af09178df7707e12e746151bf02aa @@ -13,11 +16,20 @@ DIST R-2.15.3.tar.gz 25409925 SHA256 c583a38f8dad3bc012c08116f4ba1eb2182cadfad4b DIST R-20120306.bash_completion.bz2 4325 SHA256 63003bcad2c35edc5e3329b72f85aaa0b8843b9ec424dc015b50212976372c3f SHA512 1bf874c58efb648aa96ac22b7c6c66444cb8f72b33cefa9eb28461043659476548873ec6dbd5a15bf893d6f87a7a7d18e4deb045759a1e74774d03cbb8f1f082 WHIRLPOOL 231742e9a886174b3f6bd62102d5b7cea1b050e786420f4e0cd4d9cec31ccb93fcc5a3115364776fbd00020d4e26398400e80cec126a41c5bd70677fd675c966 DIST R-20130129.bash_completion.bz2 4209 SHA256 487e969b94563fec98ec58de7e6142e9361d4219088add0fca282b482a9e01b1 SHA512 910b26e16cfebe677f438abfa5f2652e582db143d91dbf0e7d4b1ea33462c7e5c89c3a3619c63ae98bba26b11a5adb16eda9d344f8cdbe4f0feabc546993c1a5 WHIRLPOOL 2368efaed37fcb6e010f6a234864631f68549bd8e3f733561170cc5b28f5557e546d8561246fb265a481a47991a262fec3acf6abc1dc3929a9357405e0d3c6fc DIST R-3.0.0.tar.gz 25482059 SHA256 dd65c24f1497610f3ff16008da99b4f52286d6424fbd61f08037c4f10f57ff16 SHA512 a192031becacd1660d81cea708f2ebde534fde4a656c24e80e5165b7645dd03e8762569bbda478ac0a5c6bc34651d735c213bff42cefe0a5140e20efb0a410d4 WHIRLPOOL e543ae87394e238a2859a5c3f1fa49dc8fffba7decc170ba85307e32d96f9c6608e294d1d7037641d4c0e7d8cc853efc8b270e9d68d87e41135fcad9a1991271 +DIST R-3.0.1.tar.gz 25508280 SHA256 af90488af3141103b211dc81b6f17d1f0faf4f17684c579a32dfeb25d0d87134 SHA512 470edbf4a4fccf9310add110d7fa7f338e410e412b3ec84f6ea5f1253e94a435e185a7a1b62b22aee443293147ff7bcca139015b490a9271a502b1bfbf1426a2 WHIRLPOOL f45c960280f51cba3a4f3730fa79671808b3c07fd49f97b2cdce4a1de45986e62ac9bb24c6f764386a3ef1034a266b86f041a1a1652ec7f687a4db08a074d22e DIST R.bash_completion.bz2 4019 SHA256 424790f7be27a0aad7b65289c97cb15d2ca9ee272f30f3e5c906217e487c7f85 SHA512 b11efb99a5dae1f434d2f8c70154a09dd3826126a034a102f905144650c3d77851ddeb206c247dd9365baca13cf95897708a62bd6f8bddc079e3b679a8470fe2 WHIRLPOOL eb8fb8bff43873b75b61bf92af817be7d2bc4eddb2bf51c13e51dc1bdcc0cb5b0bd3623cf73fe20867c8b734732c6c89523916bc8ed4fba2931e55c5a0f837b8 EBUILD R-2.10.1.ebuild 4523 SHA256 31da6c5e6be39285b463247c44d46490c8b55314c90c6e5e8f259edb8d861f86 SHA512 c9664aecee491c43d9ad87259527b3835b70c1158eae3c374c8a4312fb96e0940edbf93c7ebc39c5a5d2b801075f6bf38f3e01b04f84adc496153efbb987f924 WHIRLPOOL 158c48b0fa24e2b1faa3adc75708cabaf7527f87f85c579c7de4e0450c973e64a38e5263b4232e0f92c391b9c763ef158a31183ba4afd8f5d96cc6ef9895e5e6 EBUILD R-2.15.2-r2.ebuild 6365 SHA256 dcb5e88a9cc516b037f5aa777bc3ed2ca616aa403e425f95c82384b3e5c40a2e SHA512 df60fc90c40fd12ec17c274a186b3d6ccc5de30ff754bbb4ce7854271f8328a9bb46696aa63d393a1c26228379d8d8ab6ca080bd6a20cf02ccf91ccbcef9ac29 WHIRLPOOL 8334374beb16bcaac6910a8b4641b7e5fb81f9fce486ea6befc44be2aa88e55370b1333d1a13c1b65281ff2707cc0eddb07c8e024b1b46a231e5c7e15c3177a9 EBUILD R-2.15.2.ebuild 6059 SHA256 5eed7c93ed61fcb7091a0584f60b9c9035bac1054c85e64fd779945c059476c9 SHA512 51da1c385a0cbb297c660a8250a9f2ae2d75d3ae51eed744e9d74918a7abe66f637c42249a1a510169174c347f233545422ce355afedc6a0da36c469abd2081d WHIRLPOOL 7295660140624e5d11252fa2bc955b74ce6517bd7d191f3c3018180f0f923c5f672d72c201624fde87086e03e8c4de2d40afec22bb7dc39cef60c62a1ba2ed31 EBUILD R-2.15.3.ebuild 6210 SHA256 0188f05a869d13859dd35ef66892a66269702bde713f4b2d23ab5f8aef7a52df SHA512 bef2fc64c0256e7ba8e80f3aaec740784c03556facfaf611689869e22d277c44dab17a639232611e66560a4b16796a7ad2e460733e43d65ddcfb7e9a16fb9612 WHIRLPOOL 1034190fb5f530499680ad8611be28a8a154041d1d826e78e4d785e2415eb2cadfbd292b622bdf3949a4b758b856bb37fa52b6dee4dbdfda64cdfbdb1ab2700a EBUILD R-3.0.0.ebuild 6211 SHA256 df5b7ca927f19eebf4642acdbb0d222bea610c49857ad022913a80531884c6b5 SHA512 36c52abb511a3d668144f3931c282d5cee9ae44b35cf1927285990c727532a222fa7bb386c84477f102de436604ed569a081fd1f2fe6926ef5c61a627a17d067 WHIRLPOOL c923fb4a1f3275d87f010996833de0ea8ac2b0b762da423166c52b4791adc4090f32c400d63e6ff089323e7fd68b7f7edde162e2b15915b095d0bf198fc0a294 -MISC ChangeLog 32723 SHA256 be3b52b756afa91e2322090760e8256ee3b80887084837be81aa2d2ebb717c05 SHA512 1680cbfec685f0840bf78920cdd660b514201fe855b9989ef89b0bfeeb129ceb9fc5ba47aaaf9920f99082f078867a9d0a5eb0e2ecd4a330069e621a4156826f WHIRLPOOL 3631d434f441a0cdd0aec11cdb958a91649a4a444c2ee1679cf278581ce782f12c1ab029e2af3293b24fc240987e519ffa7a014b4142e9e953ecfb06eea0a97c +EBUILD R-3.0.1.ebuild 6210 SHA256 0c39905c75e3a7b4d1691c2981b799bf98f37da6dcc60f8f5ae2c9021c669cdf SHA512 d566da45ddddf0b0e4df0f28bf93448b03681bc330b3802d97b4d11d2119b3e54e729db5149698676564161291d1249806e44d95d713012fb7f9397c0212dd98 WHIRLPOOL 62600aef46f6f32d12e2ad76b543145b188f4b0afef46561952e0c3316be39f95a3ecce306e44ee1b5cf08493f5d0e273a05932eb51d90d3d6d10cf7f92f2504 +MISC ChangeLog 32833 SHA256 a030f9bb0d1ce2692053b03029eb5148adb40a865123fa8d0e26a0898bd25fe8 SHA512 e024a23194a6ef62579cdb2bae62c275a9c475495d7d130deb3f2bc308eb9ae4aefe0bb0e05c3c17875169db9b38263577ba46935017281d61b4c01027f4afbd WHIRLPOOL c3987e1ed816bc1484da5876769430c2eca55f8938d2c50a6fb136a520e81ecdc5e6f7a16689afd4f2fc892c4cd2558f6d84aa0cce85549112cc5d674097f7fc MISC metadata.xml 1136 SHA256 7d7c013a77ad6ffc785202e05711d4127a77f64fe09ef919deffa80cc74f992a SHA512 761c3afcbfc76c6026cc6a6f89dae2502f495008851dcb070ee04990653ed6785f089d31a0ea3ada11ccf3d027d372256d04a0baf9ee5d2528e63a9ea4dee313 WHIRLPOOL b7bd0d3843543ff07d15e2d18ae56358477667cec9e78be266f2d983304537afd6c1bac0842e403ce62729248debe2fddfe345c66e022bf2716a47d7819fe041 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.20 (GNU/Linux) + +iEUEAREKAAYFAlGeLqkACgkQgAnW8HDreRbYvACXWrXt5AsN3T1ttHbg5Fh7vQEQ +2QCgnSFh7gEumjFh1qExb64qdgMeTm4= +=BUPD +-----END PGP SIGNATURE----- diff --git a/dev-lang/R/R-3.0.1.ebuild b/dev-lang/R/R-3.0.1.ebuild new file mode 100644 index 000000000000..6c6c7be5a098 --- /dev/null +++ b/dev-lang/R/R-3.0.1.ebuild @@ -0,0 +1,205 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-lang/R/R-3.0.1.ebuild,v 1.1 2013/05/23 14:58:48 jlec Exp $ + +EAPI=5 + +inherit bash-completion-r1 autotools eutils flag-o-matic fortran-2 multilib versionator toolchain-funcs + +BCP=${PN}-20130129.bash_completion +DESCRIPTION="Language and environment for statistical computing and graphics" +HOMEPAGE="http://www.r-project.org/" +SRC_URI=" + mirror://cran/src/base/R-3/${P}.tar.gz + bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/${BCP}.bz2 )" + +LICENSE="|| ( GPL-2 GPL-3 ) LGPL-2.1" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x64-macos" +IUSE="bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X" +REQUIRED_USE="png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )" + +CDEPEND=" + app-arch/bzip2 + app-text/ghostscript-gpl + dev-libs/libpcre + virtual/blas + cairo? ( x11-libs/cairo[X] x11-libs/pango ) + icu? ( dev-libs/icu ) + jpeg? ( virtual/jpeg ) + lapack? ( virtual/lapack ) + perl? ( dev-lang/perl ) + png? ( media-libs/libpng ) + readline? ( sys-libs/readline ) + tk? ( dev-lang/tk ) + X? ( x11-libs/libXmu x11-misc/xdg-utils )" + +DEPEND="${CDEPEND} + virtual/pkgconfig + doc? ( + virtual/latex-base + dev-texlive/texlive-fontsrecommended + )" + +RDEPEND="${CDEPEND} + ( || ( =sys-libs/zlib-1.2.5.1-r2[minizip] ) ) + app-arch/xz-utils + java? ( >=virtual/jre-1.5 )" + +RESTRICT="minimal? ( test )" + +R_DIR="${EROOT%/}/usr/$(get_libdir)/${PN}" + +pkg_setup() { + if use openmp; then + FORTRAN_NEED_OPENMP=1 + tc-has-openmp || die "Please enable openmp support in your compiler" + fi + fortran-2_pkg_setup + filter-ldflags -Wl,-Bdirect -Bdirect + # avoid using existing R installation + unset R_HOME + # Temporary fix for bug #419761 + if [[ ($(tc-getCC) == *gcc) && ($(gcc-version) == 4.7) ]]; then + append-flags -fno-ipa-cp-clone + fi +} + +src_prepare() { + # gentoo bug #322965 (not applied upstream) + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14505 + epatch "${FILESDIR}"/${PN}-2.11.1-parallel.patch + + # respect ldflags (not applied upstream) + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14506 + epatch "${FILESDIR}"/${PN}-2.12.1-ldflags.patch + + # gentoo bug #383431 + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14951 + epatch "${FILESDIR}"/${PN}-2.13.1-zlib_header_fix.patch + + # https://bugs.r-project.org/bugzilla3/show_bug.cgi?id=14953 + epatch "${FILESDIR}"/${PN}-3.0.0-rmath-shared.patch + + # fix packages.html for doc (gentoo bug #205103) + sed -i \ + -e "s:../../../library:../../../../$(get_libdir)/R/library:g" \ + src/library/tools/R/Rd.R || die + + # fix Rscript path when installed (gentoo bug #221061) + sed -i \ + -e "s:-DR_HOME='\"\$(rhome)\"':-DR_HOME='\"${R_DIR}\"':" \ + src/unix/Makefile.in || die "sed unix Makefile failed" + + # fix HTML links to manual (gentoo bug #273957) + sed -i \ + -e 's:\.\./manual/:manual/:g' \ + $(grep -Flr ../manual/ doc) || die "sed for HTML links failed" + + use lapack && \ + export LAPACK_LIBS="$($(tc-getPKG_CONFIG) --libs lapack)" + + if use X; then + export R_BROWSER="$(type -p xdg-open)" + export R_PDFVIEWER="$(type -p xdg-open)" + fi + use perl && \ + export PERL5LIB="${S}/share/perl:${PERL5LIB:+:}${PERL5LIB}" + + # don't search /usr/local + sed -i -e '/FLAGS=.*\/local\//c\: # removed by ebuild' configure.ac || die + # Fix for Darwin (OS X) + if use prefix; then + if [[ ${CHOST} == *-darwin* ]] ; then + sed -i \ + -e 's:-install_name libR.dylib:-install_name ${libdir}/R/lib/libR.dylib:' \ + -e 's:-install_name libRlapack.dylib:-install_name ${libdir}/R/lib/libRlapack.dylib:' \ + -e 's:-install_name libRblas.dylib:-install_name ${libdir}/R/lib/libRblas.dylib:' \ + -e "/SHLIB_EXT/s/\.so/.dylib/" \ + configure.ac || die + # sort of "undo" 2.14.1-rmath-shared.patch + sed -i \ + -e "s:-Wl,-soname=libRmath.so:-install_name ${EROOT%/}/usr/$(get_libdir)/libRmath.dylib:" \ + src/nmath/standalone/Makefile.in || die + else + append-ldflags -Wl,-rpath="${EROOT%/}/usr/$(get_libdir)/R/lib" + fi + fi + AT_M4DIR=m4 eaclocal + eautoconf +} + +src_configure() { + econf \ + --enable-byte-compiled-packages \ + --enable-R-shlib \ + --disable-R-framework \ + --with-system-zlib \ + --with-system-bzlib \ + --with-system-pcre \ + --with-system-xz \ + --with-blas="$($(tc-getPKG_CONFIG) --libs blas)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}" \ + rdocdir="${EPREFIX}/usr/share/doc/${PF}" \ + $(use_enable nls) \ + $(use_enable openmp) \ + $(use_enable profile R-profiling) \ + $(use_enable profile memory-profiling) \ + $(use_enable static-libs static) \ + $(use_enable static-libs R-static-lib) \ + $(use_with cairo) \ + $(use_with icu ICU) \ + $(use_with jpeg jpeglib) \ + $(use_with lapack) \ + $(use_with !minimal recommended-packages) \ + $(use_with png libpng) \ + $(use_with readline) \ + $(use_with tiff libtiff) \ + $(use_with tk tcltk) \ + $(use_with X x) +} + +src_compile() { + export VARTEXFONTS="${T}/fonts" + emake AR="$(tc-getAR)" + emake -C src/nmath/standalone shared $(use static-libs && echo static) AR="$(tc-getAR)" + use doc && emake info pdf +} + +src_install() { + default + emake -j1 -C src/nmath/standalone DESTDIR="${D}" install + + if use doc; then + emake DESTDIR="${D}" install-info install-pdf + dosym ../manual /usr/share/doc/${PF}/html/manual + fi + + cat > 99R <<-EOF + LDPATH=${R_DIR}/lib + R_HOME=${R_DIR} + EOF + doenvd 99R + use bash-completion && newbashcomp "${WORKDIR}"/${BCP} ${PN} + # The buildsystem has a different understanding of install_names than what + # we require. Since it builds modules like shared objects (wrong), many + # objects (all modules) get an incorrect install_name. Fixing the build + # system here is not really trivial. + if [[ ${CHOST} == *-darwin* ]] ; then + local mod + pushd "${ED}"/usr/lib/R > /dev/null + for mod in $(find . -name "*.dylib") ; do + mod=${mod#./} + install_name_tool -id "${EPREFIX}/usr/lib/R/${mod}" \ + "${mod}" + done + popd > /dev/null + fi +} + +pkg_postinst() { + if use java; then + einfo "Re-initializing java paths for ${P}" + R CMD javareconf + fi +} diff --git a/dev-libs/geoip/ChangeLog b/dev-libs/geoip/ChangeLog index 398e4a6f7070..77b5d830a534 100644 --- a/dev-libs/geoip/ChangeLog +++ b/dev-libs/geoip/ChangeLog @@ -1,6 +1,10 @@ # 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.181 2013/05/22 10:35:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/ChangeLog,v 1.182 2013/05/22 18:22:22 jer Exp $ + + 22 May 2013; Jeroen Roovers geoip-1.5.0-r1.ebuild, + geoip-1.5.0.ebuild: + Update HOMEPAGE. 22 May 2013; Agostino Sarubbo geoip-1.5.0.ebuild: Stable for ia64, wrt bug #470386 diff --git a/dev-libs/geoip/Manifest b/dev-libs/geoip/Manifest index 6cb267399ba4..76d47cef6dad 100644 --- a/dev-libs/geoip/Manifest +++ b/dev-libs/geoip/Manifest @@ -1,5 +1,5 @@ -----BEGIN PGP SIGNED MESSAGE----- -Hash: SHA512 +Hash: SHA256 AUX geoip-1.5.0-pkgconfig.patch 161 SHA256 83b97e4b28c23718d1b052bb80fe6f3d84927fda58b053f62f5b2d9447596fe4 SHA512 df9144229b0ee93ebfb065cad8353caec02c0297de3e2d07dd71871a770b30f716819e8a7f30ed93465fd02d8106e0ca2ef04054e4625c15582aa6ca34d4b6b3 WHIRLPOOL 9d7df44769e2d74f6595b70bee59b26c10f8555673cbeac037ecac574a25ec02261dcfb2fdd148f16ba98e5f41336c7e92098afcdbb29fec6acbad53651aee8e AUX geoipupdate-r1.sh 746 SHA256 fec9ee8ee72c3d8479c0281005543e69b46993a268657c86f271892da0457cfe SHA512 53e88072a7321d969aeb757e83ce996182e58501d6fa3089ef08695d4fd9d43efd5955ef800215fc2e96529b35d66ed82413e70f11bd5e497b6043ad1646e090 WHIRLPOOL b6df41f0ebab45258c6b50fa0ed25588636514e6dcdeb367260519a3703b72ebcdfb9c69dcdb084dc68f49544e3b38bebeeeb007d91ebe49f79ec5d5436b8718 @@ -11,24 +11,14 @@ DIST GeoIPv6.dat.gz 932782 SHA256 3e83499214f44105c84989fe19fddba1208ed756443835 DIST GeoLiteCity.dat.gz 12108586 SHA256 e322104ed00676102da1b5e66788a51bfd386447d2422b9cb770bbeb4e36954a SHA512 2503514df4908c1f0ed7a5d43b7f9d58fa25e2e6d6cd984e122a8bf3733f4b9372a4147a1c8678f70b83e518fd0b69a7e162643613a77ccd93d68af201a1497c WHIRLPOOL 12baea7c0a55122dfb72185896c71790f8d1e7b4023bab3594b02ee1ca9781a19bb8ee62b751d69ad6a55186caf6504845d9039598e35a877e200748476e04fa DIST GeoLiteCityv6.dat.gz 12962880 SHA256 ab9c4deee7b3ef8bd665db67f2ba312b61d3aeb0233e8b2277f8cfbb9d7f2e6e SHA512 c8b5fde5fc5513ab4f5149e8babe2f1c59a5ff94cb69b8b60eb347ddee42d89b5e93919128240578c2ea263d80191f8afebb21159d5d8dc6c372bb872b8e2cbe WHIRLPOOL b2253e0193b8a47b8a6d9d0fac887a9410d5e361d4be5636c2e5e63fe5123f998f71dbaa89ff7d4bd82dc47f771705878a342598c926b0130585bedeb00e6490 EBUILD geoip-1.4.8-r3.ebuild 2070 SHA256 1c20af8e8d4e4eae22845dc8aa8c64c9f70bbb5af0b35e3a2a21de942e89c049 SHA512 8d656bed1398cbcfd584bd71ecf552066208d89287fc9e89d8cccba32dbf948f6dff096f414f6fe8ac098e2ff688afe1af1975d8ff42aa186d9c170a07197553 WHIRLPOOL 8f5c09c81255accfc798a6b31fcd764bed0eddc930b51c76b087bc03bb55e3a05e80491a787d50fd09c97108f602a6adfe855ac77c34ef4c808a433ecaba6f07 -EBUILD geoip-1.5.0-r1.ebuild 2106 SHA256 a1bdf3ba6c86c53fe8e2bfed63706704a8b0db97ed7088126b503af456ea129d SHA512 b0767ae28da9af6e99404f2848a4eed251e94e5b55587be433ec60ed6df2efec527e1e910f8c18a81ad96feab31de6af765f22be93333440348cb87d039cba8c WHIRLPOOL a89f9b72f418ea9454680df6c109873db9a9d03701e03cd98fea087936f57f82275c04e34b3cf9c7edf6562a7897f2e5400d4201f8e9fa3a94d833cce22c67bb -EBUILD geoip-1.5.0.ebuild 2097 SHA256 b5a9b4ccbec6a2ef0a9b5091b83e11204d9d17a39696b556bdc03824af2b1ecc SHA512 25f215303acafb12fb1e187700f3f8e20e84739eb4a0694596ce0c3bbd0e11c844c572ac23231de5f7f56538d1421357df7ed62399de1513ddc1e11089641dd8 WHIRLPOOL 073a1311e0a09dfc8358cf067482dc66d022710c22919e0d725a06a0fd8c108e03c5f451a24324f647dc4c8747465a2e28a422235d17fb779aa6b3426acf7bd8 -MISC ChangeLog 21965 SHA256 d8b81e35163e7c2a4381adca45f9b7bcf7419dafb47e63bd7fb7ceebd809b97e SHA512 d257e5e3d3c703f29f8821d3966e1b3873fc29fc163eb55ddc57b887236b1a8b0045557f59066c8cf5dd536ad343dec61cc4cca314cb7dda7538785abf37b676 WHIRLPOOL 0feab1a25b969de3e3dcd24974334d74f1df1fb82e8072935ce1e306a6e7072a4999ef10ccb05ffc910ee4a780efc3e30ce7229600501d5653383edc42aa6ba7 +EBUILD geoip-1.5.0-r1.ebuild 2116 SHA256 b40e5ec3314c1343ae41f4b45d367163546d2fe2c4e338d3830c6febdca790c9 SHA512 c2d0404c02b6d4529da2eb0ce25a4a33d6134531b2abe71ad90007b6dceb89390ed137db9530dc6cd27749b16e15cd9960a39d8c061007b728afb3df3424aa7b WHIRLPOOL 11ce6ca7558f9e79507df62aad0a71c91a66c246d8d32c24852f0688585d0d496704fe0bd8350679a66e541f75981af2c5b52f91df261ec7095d6310be873632 +EBUILD geoip-1.5.0.ebuild 2107 SHA256 b717881cf39f7014e4ea0e0c52cc5f3577db3aeae5fc58d59c9d5fec1246d19c SHA512 d6b7332bfca4c9e59f5e764eb51a876891582b4fe8763308a66997f6f677ca2cc82c099c6a1c0b277fa955c897b00cb7dc4f9f11d0bcf32fc70c7fee5f07042d WHIRLPOOL 6085aee439302fa2b5571d1397935a89c4b5faab7cc45a065dff0ddbb8b05ea05fae8bb09c6b7168d057e89ff1431f8e915a76985b40a11f828f4a7d91ec0e42 +MISC ChangeLog 22077 SHA256 1f987779f86b85e80c37dc6678a81110c6ee07fa5c714398cd46b13593be8890 SHA512 52aa2b616a84305ecf4423a56e96d7a31d51d55071dbca53535c724064fd4bfa1cc9c3abde7f80e97ab56bc467e24af62b1f28d162d4f1d22bff59f266be5898 WHIRLPOOL b7b5d64792730a79b27b0a58caf1e92c2a3b0c037109f95df896d336b999d9e182ffaa62c9e1e0e3df55a75c5236598e6402fedf38d9ec888f8b1405716d4e5a MISC metadata.xml 414 SHA256 1280aa10349cf419f09b873a052d4772b95daf2543c21a29a2d47b327935a551 SHA512 076663380d999ca1bb8c6570b674e150acf39d0b095fabea2a43f1ef1b32c406205eb0c49600fc92791f87d8b8c65fb39e8bd4b76b006a5b7bcef150411bf200 WHIRLPOOL e174135cc0c291d5c38a94f285f1830686d44c380a7d63e6f0b980151bafd91ad952bc44146ae43dbd6e30f967d50c35c49319ec568490eb177ecb0ef8c21bbd -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQIcBAEBCgAGBQJRnJ6+AAoJELp701BxlEWf76YP+wY6vZtQUNjnaIhsT8OJ2Qrl -AxhSlsK8r4Y5IF9iQaCucllVKjo4XTqD2TTA0MYfrQ+SanG0cvqIBA3Is+IZPn5u -SlTg2DruwvD5AYctP1uYKFU9ptPaEpzwrm3h1rv3J9cVgKy7tug902Qau+tREFyw -Bb9qbK9o5btOLedpvsbkLsuI2qzlNCEthhRUzipFwQQc2+VSEcLDde4nNAoMBXgH -0wuBCuIJIpdxucdSzp5CSfSQsgHH0stbet0d9AzKPqgHkXiR/OEyHnhGacMKUHq9 -Vzne7V9wbuEbnxwM89xymHcAgbDDv2nzrSW9v0zrDhL+IDGIwz0iLRzobrE606SB -i8DY23WlWaN6WXbzUKIxHhI9zY6TgfppEFT0duayo7i3cesXAHRmY9LLNVBAQ8fu -Knw/ikoIm5tkuSKQ1vXLdrmEbH9p6fnR8MgrIJn89MLpg4CEkV/uViUoWNfKJSYb -N6RIWm9ogmNNPsT0Zqre/VfnGD3ObjAU/We9YSWW5MU+qN4G9rdqp3VJ9pYKFh6c -DbZWygf5nFCQOeWYWE2K7qwhAvmBVs9FufR8qA3VPb3ENVJTuLvR9oUkVYoYGMZY -g1ScxwNFSS2FRLxhmMpvSb/tUWusLY4Sy11hlsBJF+UV0/HO4ew+D/N+jwIYuQJ6 -Fcc6ndjA7vyGB1SOiS8D -=1Bse +iEYEAREIAAYFAlGdDN8ACgkQVWmRsqeSphOzkwCbB+o+trHTeanvo/WcFTlJLIV3 +ex0An3TxzUhgCTS61YC+U9ixUZeGhiur +=6DO8 -----END PGP SIGNATURE----- diff --git a/dev-libs/geoip/geoip-1.5.0-r1.ebuild b/dev-libs/geoip/geoip-1.5.0-r1.ebuild index e9dc177fe0e8..a355077993fd 100644 --- a/dev-libs/geoip/geoip-1.5.0-r1.ebuild +++ b/dev-libs/geoip/geoip-1.5.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.0-r1.ebuild,v 1.1 2013/05/20 15:26:33 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.0-r1.ebuild,v 1.2 2013/05/22 18:22:22 jer Exp $ EAPI=5 inherit eutils @@ -9,7 +9,7 @@ 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://www.maxmind.com/app/ip-location" +HOMEPAGE="http://dev.maxmind.com/geoip/legacy/downloadable" SRC_URI=" http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz ${GEOLITE_URI}asnum/GeoIPASNum.dat.gz diff --git a/dev-libs/geoip/geoip-1.5.0.ebuild b/dev-libs/geoip/geoip-1.5.0.ebuild index 7b10fee685ce..189da2da5033 100644 --- a/dev-libs/geoip/geoip-1.5.0.ebuild +++ b/dev-libs/geoip/geoip-1.5.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/geoip/geoip-1.5.0.ebuild,v 1.10 2013/05/22 10:35:16 ago Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/geoip/geoip-1.5.0.ebuild,v 1.11 2013/05/22 18:22:22 jer Exp $ EAPI=5 inherit eutils @@ -9,7 +9,7 @@ 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://www.maxmind.com/app/ip-location" +HOMEPAGE="http://dev.maxmind.com/geoip/legacy/downloadable" SRC_URI=" http://www.maxmind.com/download/geoip/api/c/${MY_P}.tar.gz ${GEOLITE_URI}asnum/GeoIPASNum.dat.gz diff --git a/dev-libs/libffi/ChangeLog b/dev-libs/libffi/ChangeLog index d324435bfb4e..930245454966 100644 --- a/dev-libs/libffi/ChangeLog +++ b/dev-libs/libffi/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libffi # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.168 2013/05/18 12:07:20 zorry Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libffi/ChangeLog,v 1.169 2013/05/22 16:08:29 zorry Exp $ + + 22 May 2013; Magnus Granberg + files/libffi-3.0.13-emutramp_pax_proc.patch: + Update the emutramp_pax_proc patch with ChangeLog 18 May 2013; Magnus Granberg libffi-3.0.13.ebuild: Did for get to run repoman commit for dev-lib/libffi diff --git a/dev-libs/libffi/Manifest b/dev-libs/libffi/Manifest index 76064352b932..1168055fcb08 100644 --- a/dev-libs/libffi/Manifest +++ b/dev-libs/libffi/Manifest @@ -2,19 +2,19 @@ Hash: SHA256 AUX libffi-3.0.11-x86-pic-check.patch 3716 SHA256 247edfe37709f7a0d193169a31a0a8baa730b0d63606ec56928088aadf498c4f SHA512 addbab5c6a9a4701e43443ae438b2fe6cee6c2b5b09b5d40706ca648c311ef9d0d900b9234cfa7872aacb52bee9f499c9d3f8e27af1d983c2f791185fcb028ea WHIRLPOOL 395e3081d5c5b4da7cbbd60689e64459533eb348d8962b59a507f19d3167543b57e4a1ce82b5a979e4709daf7125bc61ef32d0870578951f30a1365745c8613e -AUX libffi-3.0.13-emutramp_pax_proc.patch 791 SHA256 59254b9d64604896dd613566d4c2cd7bc361ba7ba8fb7af34d5ed6f12bbc36f9 SHA512 87e5f63a964cdfe2578351ef98d6c630f03e01e0ad6ec7016d8b7b3061ae0629677b673ac014b8e4859d471b0b679c4c02302412ccd91c4de66ba60b57ce57e0 WHIRLPOOL 1672ea1da6e4715e0cacabf70d57e274e68935d5c37afbdbff83aebcce6f8c0eecd01c242537ea50a177f412f79217392371e5ad405ad001a1175b2594244f0d +AUX libffi-3.0.13-emutramp_pax_proc.patch 911 SHA256 955aa3d87522cb220133fa853bd3a5a7af1fe7cf5cc6b9eb74ffffb9ac563aba SHA512 402712b21feec0f162758adad630ecc588596eaebd2e79bb86802f313e102b8ef6d08eca0580a1aae25dabec3e018c499e2ce1960edc6af9182f67cd8cc9b0e1 WHIRLPOOL 22f76ca6f909c80228958115a8db37fbe5f12e291cdbc1fad672a0903c54a7918e2cee37fdc263e9c350f3c79a7870cc8f7a05789668a8dc87cb8434a6e20f9c DIST libffi-3.0.11.tar.gz 794220 SHA256 70bfb01356360089aa97d3e71e3edf05d195599fd822e922e50d46a0055a6283 SHA512 0049388d16207078a3d6dce97c877f1d9647aa9d908a9372a3f67ca064b70d8c8b23ee458be4a15a6344a5d39ea3e6292be728dfbcc73e1efc0b1db03be874f3 WHIRLPOOL c5ee01a6415b2715a4542d0997e3a7f42cbc97e476589d4e093fcff44315cc83f78a02dc04929c96831309966ac196e6ceb134c8b14cfc02313e139a98e6c11a DIST libffi-3.0.12.tar.gz 844641 SHA256 2ea0db90c2bbcc907c3aefc3f76e9dfc3b35c7a0fb75a4319f5248e0172c1e9e SHA512 9ebd5f274aaf007a5f888d3eb3a1652f61f7ff46ea23283a94888b229bcc959fd22904a7101989cd238dfbb10c335129cfa3a947c650dad72522f7fcd0d9c79c WHIRLPOOL d1d2247b3727b4f75006db3bcd4b01dbde2817ea774dadbee30bd8cb4578d01176be089ed6e4bf373587f824fef06ae7fbd1d24f775da7d8f91bb9e753d2580b DIST libffi-3.0.13.tar.gz 845747 SHA256 1dddde1400c3bcb7749d398071af88c3e4754058d2d4c0b3696c2f82dc5cf11c SHA512 fc47f5d25197c631754efe05a349edb556d072807ecef19b41f17c1a8f39c95221be64926fbd05b1f8439181df1ddff8fc01462ce3a26005b75159ddc27e6f6a WHIRLPOOL d5b14d48a7b35f7349ec938d0deac62db7022ac4d611ab13bc7a6a2766a47e210fc1663fc8c6d7ee48d421c06b66f558010829ac2c215620c76d0bf7650e1308 EBUILD libffi-3.0.11.ebuild 2077 SHA256 565af7f1d62cba0a40c56d2180f70ab2373d2729ba1ff29b9800fc26d13f95f5 SHA512 99b841085e12f72f822808b6cc9f10c3d466e188d019a6ebd975c74091cc72a4d075c1e8ee9480d20a54a9db01289fed5fae0f0283761ad2f0c2fc67be7b4813 WHIRLPOOL e2ad88ccce87f83976180c65e5ee564fcf1ce6824393d889751d733768a404eae72dfe6676e960cd1a08d5c5abc69493ad4aa52bf6f214438ab486a5eb19823b EBUILD libffi-3.0.12.ebuild 2086 SHA256 dccbca112750c875d512550c5cd563258e4227b0e605337cc3e39376ea7c9cae SHA512 54fd387ebe59d80d1eca707f44d3027377d980a7fbe29c17649755acbcf981684ace657e0aff23b9e0c9b84fece22eef17f686a3ebd6b7d0797db9b98ec9c15d WHIRLPOOL dd92f31a7ae9e9c5c0a8a51c38816ce5d83cc3f46e6c3401d3f9dfa6cba1c9c8662a3a812ba7629d72d187cad81848aa236fe2a02835a5075109e2dde8062917 EBUILD libffi-3.0.13.ebuild 2092 SHA256 2db0cdec0ff9ad3313ccd6232aec5abed01368a94c50bf7b664a384c2be7145c SHA512 9f72eaa2be5d5a25eec880e3bdefac3f02f29e2966c3cf378bf2ccf16c237b8af3773eaf8c9df41e05965d081501debff583644fcdab9d8af70f0ae19be43673 WHIRLPOOL af67d101b5cf9bd00f94b7dc4d60eb653384d1328695e3f2a120a7350ef3bd0c89e1b365e1793708fdf098faed2086e4e7797de454849cd54d728fc0bd80aee5 -MISC ChangeLog 22737 SHA256 0e98b3c6479fbabcbdafb56b178f96b9557f70ff9850aa8a7a8d551db2c8122a SHA512 c6ca2118fd9937d497acf42e72b2e36eae2241b9d952d4c82b61d1b25115e85b203cf033bb717d2e03be16c7b8dbf21ab36069bcf73084dd0ff09bcbf9a2acf8 WHIRLPOOL 9b9776d23d14e97b39d115eb2be3a281c8236989d9c08ebd78da8ee02ecff1f10dc54f1a4129e2423dc4e18f239b5c41f09eda9c194cce80fd1365d4b457b7bc +MISC ChangeLog 22887 SHA256 def97a87c8d1cd63d8a119fc15c23cc11fab10915408f20c4b48951ae8685350 SHA512 01cc9adbb09b7fa2242c31b16dfa28495db08cfcd3115384247beb77bf1e1995b375a4ac4b9d0553421044f648d93e353faff76bb9ae3a483117e3b29e3bcfca WHIRLPOOL bc477a94ddd2c1dad49e2af1e3e1e7efdb4ed18ca85524ce99b0012d13771ec6034bd401e0d6af7d02fdc5a5ec5b0ad8c59f47cf7516bfe21bf742bf15b0d9b9 MISC metadata.xml 1768 SHA256 1bb92578368c006819d0cd5e1a94d32cffca87ddef8d571c29b483bedddc9b6e SHA512 2291c051ce2cb5c31989af68a705c0f8ce8d6ff23f2a66f839463a56a20454a6af276c5afc75687919e14fa614862356618e44c88415ff9884725e6e6db161bc WHIRLPOOL 7da7a437bf11dfcd5b5a8fbb067463ceb588fe83c1db0d15253293a955999d5dc65754918c73840a9a5020f86d1b6f1c9f8d127f4e1519594bc0678742727d45 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlGXbrgACgkQe6JQqv15gH/1RwCcCx9n8POgKXen7bg9U/cFVOp3 -BPAAn1eKGcwijRVIpnT0RpZg1waJOc/a -=Ua/N +iEYEAREIAAYFAlGc7T0ACgkQe6JQqv15gH8NXQCfYZ2qhTuci1PPcckPH0CYou5I +L/oAni1JV0E29cRan13KmxvztIw8ifUM +=WKqi -----END PGP SIGNATURE----- diff --git a/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch b/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch index eced7fec2118..c27bd9bf8893 100644 --- a/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch +++ b/dev-libs/libffi/files/libffi-3.0.13-emutramp_pax_proc.patch @@ -1,3 +1,8 @@ +2013-05-22 Magnus Granberg + + #457194 + * src/closuer.c (emutramp_enabled_check): Check with /proc. + --- a/src/closures.c 2013-03-17 23:27:11.000000000 +0100 +++ b/src/closures.c 2013-04-29 23:26:02.279022022 +0200 @@ -181,10 +181,26 @@ static int emutramp_enabled = -1; diff --git a/dev-libs/libnl/ChangeLog b/dev-libs/libnl/ChangeLog index 9cb5c0f37dde..a2345ec46520 100644 --- a/dev-libs/libnl/ChangeLog +++ b/dev-libs/libnl/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for dev-libs/libnl # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.154 2013/05/21 16:40:25 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-libs/libnl/ChangeLog,v 1.155 2013/05/23 03:44:57 jer Exp $ + + 23 May 2013; Jeroen Roovers -libnl-3.2.16.ebuild, + -libnl-3.2.18.ebuild, -libnl-3.2.19.ebuild, -libnl-3.2.20.ebuild: + Old. 21 May 2013; Jeroen Roovers libnl-1.1-r3.ebuild, libnl-1.1.3.ebuild, libnl-1.1.4.ebuild, libnl-3.2.14.ebuild, diff --git a/dev-libs/libnl/Manifest b/dev-libs/libnl/Manifest index b5a5fcb9adb9..98025bb277ba 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -13,35 +13,23 @@ DIST libnl-1.1.3.tar.gz 280024 SHA256 020dd941bbb4ff261cdf51ab954557a5a50973739b DIST libnl-1.1.4.tar.gz 1174974 SHA256 4f80c21fe5bbcdde6e72b59b4f98306063a41421f909887c34e58d93e746d063 SHA512 25e26ddcc16540346ea34815ab6ac094177e5cee2eb3d843c4f8b30cd9d83390a3e87cb46046dc3bd9ae4d21f77e57bb3827c2cfc588eb18afe049921f2030b4 WHIRLPOOL eab5547dce7b11c86123fbcc9cd8e00100c7e78f48a4a9fef40f80f89407ea705b701f8f0eb7df63997866f17b0cf0924b43c69b29fa1f1b016fe997371b950e DIST libnl-1.1.tar.gz 288932 SHA256 35cea4cfb6cd8af0cafa0f34fff81def5a1f193b8b8384299b4b21883e22edc3 SHA512 add02849845bd0029968a9fb9a642133051196da17cf7b45eef192de1c09ad0b0ad7cc8424fa325f1c63262779d0abfd74e4ecb634abe66a4d2f394b3ad3e3de WHIRLPOOL 1fa96e4206acf5e9091a2aeed9a0694b6f4cce3aaae9a2074cd8713e4f1f526b5af138b69d03e7f233cc52d1acd3b67237455261ee42c56bf69c4b17caef0b84 DIST libnl-3.2.14.tar.gz 687883 SHA256 6bb043eea08765bada37a053d932f073db9d51e7a8cd419e237c785ba6369e2c SHA512 14e9b733beb985d83bb4672087c91734954a6e90fe71a825dc089ab797ddf6a9e9ee39a046c5b996a3a0184588160a47830a368540831443615793a1eef647f5 WHIRLPOOL 34f6e4cb8b07b67a5b5abfaa59a0a45f114921b894959ede2e7b44640d6aa012a4bc1e08752b31b11035b745001a43716c3e093b4ccfecfa99a0f6a0b65a7539 -DIST libnl-3.2.16.tar.gz 712043 SHA256 c43a42336c6a3cf559f390e202f8f029d165bd767da7cf7a32a815c570b31826 SHA512 7aaeac4b13a374bc89bebd932da522223776c7c3462002bd9c6b9c1fde1ff3620518b335e117ee78f5da0007a19b85c82078c21348db6ad9aa684da7c2083aa9 WHIRLPOOL dd43f8f4a2eb787a84a77ea0e54bcd4401822d333d57fca427fb4ba760ae81be58a8ac916e42decde2fc8f6ee2d7dc8fe570e046d8bff3c82317fb280199542f -DIST libnl-3.2.18.tar.gz 739175 SHA256 6563e4e72a35f9f96380086f6bd17307552977af98e98bd3dd0fdde8013d53a9 SHA512 448968a698f22427e3eb7846cd0ad71a227e1ac998d9eab0c338a0d0811cd82953c676282d62e82441f2362493b3b9597330a8f916eb785ffd9f8854af2a509e WHIRLPOOL b88a3a425a82acea69f2bee74b171d9a0f51509bc1752877a8c6eb56d69b4dea176d289d524401c9ec392243887760ae76497fb29c0b83afd2f9956d07a92997 -DIST libnl-3.2.19.tar.gz 740008 SHA256 37a611ad84e84a15daf2736cdd2c5191f3af4e1b12354f7d260f0264383b098b SHA512 1a4c0f9cc0a274749f442d0c4a386c5d65b904384bef1e866c768422d0f542607dc8f65604f44241347ee31c1dc0c8ee63f216fabd81219d6d93a19d076ab54d WHIRLPOOL 2c44cec21eb3ed2c2ecbe894dbae178b2c0297d2bfdbf9f110b1c899436bbec8b942f6c06770674404570288e27af29f9c80bc50640813c0560f6fa5859d6643 -DIST libnl-3.2.20.tar.gz 716354 SHA256 9fce0b8f946312b3b47ef469ba372dc370821aee9d8795bdc42f5121bee2d237 SHA512 23a427254346d6725bb2be5768cdc887bf56a865f13088eac565abc9ccb7a57b4b956b90aa63fbf7dce4b8135db07cafd4d44aa8783a802156e1e934df49c9f8 WHIRLPOOL e5400e95a874273443096ec5cc6346431b31d5edbd8edf07955251228250852421662f94e5a7a001e2efbbb70b8cc59fd7a6e8c1b51623e6ea57d3958681e050 DIST libnl-3.2.21.tar.gz 716377 SHA256 2dc80f043116ec8610d9d418f5f5e9283f3d9a3a48b8d51a8cb0146b3f279604 SHA512 d0efd2d536c2c58f4bcf8cace2f8a13e0d788c4cb2d189e3afd995a0fcdcb861c6606cb3efa223d4426d0f74daecf888fafadbfcf9adbbb64b56c5da5eefa4fa WHIRLPOOL f2cf29c4713c49b9baa58b178f6155c2ca05139e7320404b71bdf52bd8d68ebee42ace7fe2bb6d4d19d487108f836ea343ed58b1a8980fa97158ebc258c068b0 DIST libnl-3.2.22.tar.gz 730249 SHA256 c7c5f267dfeae0c1a530bf96b71fb7c8dbbb07d54beef49b6712d8d6166f629b SHA512 b4918857c73d8da41b3cc9d61e579340538c77846aed4291ed38ae549d8c85fa1dd632d8fafc493dd27034440d9890db0d789cb1666ca916d8f82d97ad471461 WHIRLPOOL 0d13b26d087b361fd7af84ca034da123493d39ec5282ca8d0d5434a81b9c85a374850d0dd304328812f71c4e68027e27db32e9c3c4ce7dd499374b48c5d9ca4d DIST libnl-doc-3.2.14.tar.gz 8766064 SHA256 1db05aaa61c14ee578fa432cc1973a73379abe175859ef9e92ea033eae005e43 SHA512 2692f6d4c3e3a9d4fe9cc210fdb03751356daaebe19f8d9041804252a6c220dfc7ad4e72da428b56ade30afa2ef3ec3b6c86416f07b12013403dad8f735b0c0b WHIRLPOOL f55436bc28750f4d4d1bf716fc73e36a01b27d8799c0b2d8fee785db3da935fae4c4ab05a03dd4c65b9ef0cc32d2c112182b4e343e97b116a28da90e3035d96c -DIST libnl-doc-3.2.16.tar.gz 11792430 SHA256 71c9aef7bf1495b5c2a488abf247ab5a4744783e8b4c6641b0bbb8e28d92605f SHA512 9224f308e3f01fd7a2d98f0cca0bf6f6d6535cfdc905c61bbb242c788a7c6121dee80c135552fd87a6e0dce31be4dea89e981066982f9d4f96b29f35ce92458c WHIRLPOOL 58902aff10580f1374dca9885060a20d32aedf1264c628c0105a860c8870d1ff9f4491a5b16389fb677815ae19aa98b9218ca3ce46385510d4bc88d0f5e574f9 -DIST libnl-doc-3.2.18.tar.gz 11717270 SHA256 60c8a4893138f655f34019bacec022dd3b5930fced839e9aa6405b69e903099e SHA512 c1036ee0005e71fc604125ad505e01ba248124f0cf0efdf741f7bb844296fb462f10b0735dcc42f3cabc9f52b022352cd681306432189df98bc36c1c1af6c3dd WHIRLPOOL 4af9a7b5edc27c82102e32c59d35815078830a67c0566690e60d3ab9cbeef786417abe538bc897fdbfda771e0004c0ed7b58f0ac271ed7e5dbdb68d9554e5596 -DIST libnl-doc-3.2.19.tar.gz 11740382 SHA256 77adb00d09af87136c0e2b7109f4ceb4519bbd594e6b541e76d3a8e8ff273228 SHA512 56b1cb809f4445fd380c58aca899a480b3fc9d35c749a7be5185e183dfb76ccbb93b7100dbc8f944aba14b6ebeedaed252b67b19f6e0896993921ef0ec40fe4b WHIRLPOOL 356644823a79f01e950140eb84d89c9a4945ae2a9b7e42f63071c9d5347c75e3d012cba5e1de4298f23651f86f9f35e99594dfb57b93c23bec904dac823da916 -DIST libnl-doc-3.2.20.tar.gz 11750911 SHA256 7ec13ef8d659ee61114b74c6e30b61f18f4acd466c8a0a13588e42443cb2f9aa SHA512 3b74c5d7e5d95611b2914e701672dbb3f3c6d0a8cddcd2a985ba934eae2367b1815749fa91253394540bc2e6cb1df5705117e91d248a70d8cdc7663891072684 WHIRLPOOL a3462c467b1503cacd810325c696965d09159273d3d34584d38dbcd64be0e55895f2978f2f34dbb7e124063b1e0f6c8c9d1505cf2df1ea86f70429b954786606 DIST libnl-doc-3.2.21.tar.gz 11576303 SHA256 85c53d79bf561aca79450ba1a650d2d738d0597c350129270eec265f3813a39c SHA512 6956ca909b44900b8485d9676bc000aae8c8cc18716a0eb7c704cb807b9f931a409456e66fd2e2bf063d1001445b4d73243a5b3fa4f182264674ca70b9099d71 WHIRLPOOL fae571813de8fd1bb20a01afa9bc5af267efc863a368116e35d37b323e9832d83e79ff367cc62c1e42bf06af3a874d47d6da8912eb13ddbcfc652458c4f3a78f DIST libnl-doc-3.2.22.tar.gz 12038176 SHA256 15631d005e07d64d23e1628d5b6b961639d1854c4303cbbd509746729a43326f SHA512 531a1c3d09da31d053078678f306b6b4909440cc26bcb725cdd284cd9ae3f7ef406b0f979ab875e17277043aa1d41325dadbf99d36555db2f8703301ea915ad5 WHIRLPOOL 06acdb9c8d24958006ad672816a4ae77c0173d62247f4ddab04054e695fd8f598d6ff6ccac10e677c730cefb28d0e0537a7b8b5816add6a51960d492c5f59ef4 EBUILD libnl-1.1-r3.ebuild 1095 SHA256 7383082316c492801801f9d6a0c49cf2530659d73c613eb49bba04db996c91ac SHA512 1f7b78039ef75b2d423eee2259320eb9c4afeb7ff327dbd3ec39a76b67aec1bb1a21431abb881470acf7c25e954d589cd674dbb39f4b09c7555a79ad9a72f88e WHIRLPOOL 0a6bfa722955ee04b78dc4befc9a0b03c43ac52286163870c24a5ffa765054d6193156d930af4cd4b4cec9c4d067fed8d2776f8aa182738b6fb62bf7d9f08933 EBUILD libnl-1.1.3.ebuild 1162 SHA256 be88a63cf7b203800ebb4fe37768d3bfa03689b2d1be39d34f1ca6d441273d04 SHA512 651fba1640e84281acefca7680b723fa8caa07871209dfab34fae5a1a1236ace2583934e1c0122513fee090a1ca3b4cdae3f2fa6d57d77cdbfc38278cece1868 WHIRLPOOL eb89dee8c3054680fc4266f3869db1c7946f1270a0ecfa1fde5a107b33d778a16bdd1d08f4e5cf9d0ac3fb5e321f5be6c117026c62734ae82c97663754ca9e69 EBUILD libnl-1.1.4.ebuild 1259 SHA256 9b64e577a24e244e7f8af04610076e1880d14b4b5b5cbb5da111eb040b9a183e SHA512 6ff8c9a6a0243176991e8a22dbe893491871228f25e55e32720c10c39d55bcd51ce6ee0293626759368970be4cbebb024b4c798bf85acb293d211fc87b8f796f WHIRLPOOL 7c9a2bccc4e4fef3d8a03abc895cfc0f7d3b23f30f824fcc8888999ab5573d2022cf3a1de30088bb8fb8526d9beaccf5b6ab7916ab00dd1781b32b3453178617 EBUILD libnl-3.2.14.ebuild 1198 SHA256 d9d0feea120cb83e8cf883771b377f29d215f721c7cf3630b7644bd132063d78 SHA512 a4c3a4df0b715daa8ffd3231cd243ab881385ca3e415efa5a51cee211d084ae547b722e94af667963d504e3f51436ef4e8b4e663f98bbb5439a52562877e988d WHIRLPOOL 3cb9343c7ebef502b8ebbf01d65280f704bc4e11498791afdab3a452fb86f3d495328334d4181a9d42f90a9218bc623b30ff91b3d59132e1eb44835b5aef78cc -EBUILD libnl-3.2.16.ebuild 1307 SHA256 c8a028e3184a93fe04ee8869553c989c74334bbade8785f7b09509e0e899584b SHA512 a818636307e34cbacf49f69d20969249c91f5a949de9ffd51a9507a7bce814c6e406d53d5083cea5b974d8cab3270298f61c3479d441e31184a5a8e5e542ef80 WHIRLPOOL 5fbc12d17a9adb8b2a2b0098c49d11d19d154987bf424ba720d7dfe25c29eba442806fabc9d9b3fc5d7935531fe2d7fa1b8ff915736bee15540c72bb2790da76 -EBUILD libnl-3.2.18.ebuild 1205 SHA256 7385eaa07fbbfd58d102b58c6cc4871d7dfac384732999aacde1c1eb6ca9a2af SHA512 06e8b044f3ae3248c5dc9ff0ab726eb34062738691f894420b68bcf8ded87e7e6ffca3526452c2d0d1949895a67665558e5a66db0f041cd764081bcf92353db9 WHIRLPOOL bcb3c9a3887b18218a9c8e2afb6ec4873c76d9495bb97747fafbf4dbb3a6e06321324ca181beb23585e4f407f11f459d5d73e92484322d4dd646456ab459c57a -EBUILD libnl-3.2.19.ebuild 1205 SHA256 551def43ad7fd22dcb38714187f5c75492465a269a45d133c34370ae49491f8a SHA512 0e4a828abb2381a162ff745523fd592be1c56c6ba4cd323ede66dae64b1ba6e2a6b796fce9d1d17398af2d1473e00877bfb09406b69f74a7bf5f7eb088806eee WHIRLPOOL a598d483f2443bd32470b0ffca2bf9c5091539beb5596c6a48ad8b9cea011c5b315431d321ac82d129f13f9df7d9840e782d65e5adc907ec600e0d04f66dad19 -EBUILD libnl-3.2.20.ebuild 1313 SHA256 78b9abd266f9d26ef1de5a4f1657dcac8f3869ee966caac0d4c54c9907d4d0b5 SHA512 5583db415b5aaf0f6f8e51dfcc0944055a67672a27fa51b943aa6d9c1d7bca6670fcdcae5879f65342b34fb447f3bdee091dcf8235e7fe0d2a91ea4111fa20cc WHIRLPOOL 05e1768ca8c9e0443807ac8a015353cd0a3b6fc1dc0a53625b55115b6460513627f85a70ab1d57075ade5132cf347dc55c06d05741c1428c2d7fdd4f4cc59acd EBUILD libnl-3.2.21.ebuild 1313 SHA256 da1c5a40230b35eeb82d66f3d7bd86a21cc2d76cfa8c9637fdc76e70bf97c7d6 SHA512 1c0984431530fc8557411ee3f0c73cabdc3922964b0de4406447e6daeba8cbd769b16211ef6da17f5d08f51cc0d56dc2d198f6d2fb4a2f946f17e68049460c88 WHIRLPOOL 4a7b53aaa365c7ca64d7e65d8b16e9b1e28c24fa072ea0ee698d0a505c7770624ea5905393e2b6fcd7e0a0a6aa2dbc815f7289ce069e97e74f3ebe7d18bf3443 EBUILD libnl-3.2.22.ebuild 1313 SHA256 ea71188b5ac8b8e7b17d413d5f3f4cc24e0f0291e43a929472b6c69ba3aa7688 SHA512 b1a3eb3b1e301c1e83b7fac8c6ba7d37d978b2d882d6f872469ad1263857c32a37d016b3ccd4a497f947680e49c7dce3d10be0b377fded0beb678685b2326f16 WHIRLPOOL 2fa1761dcfe9933471901d4df0d14894ffdedad1b5e92074e26e7bf7919e93fa2c5b3814cfe234ffc00327d2d75e291193fdd58d0d3e131ab4d5fa18501b15d1 -MISC ChangeLog 20284 SHA256 dc6be811336609bd5ccea8655de4228cbb88f4d7539aee5f3038082cb00badbf SHA512 8c221b4469564b4c191e3fbd595668e32174d82558a52b601d735d9b644841c05441756593c193afc4b3fea689a53749043f9ddef93eb0a4b17d4a270d06454d WHIRLPOOL 3dcd4cb547111f8b2b7abf370c2bd0bed3b6a1cadc362421c22fb5d86b5acefc0122cec956e196e638562a2dbab9cfe79867c826b56f8ad2baeabd8aafb41090 +MISC ChangeLog 20429 SHA256 20c73550e2ab4b63d0bb9f759849cd85d3a84ea99bab6b01b9b3d736cf9205b3 SHA512 bbcbfb246ba187ebc1a39657430ac3678b5fd06b0f9e029d471e7d26130bf04192f535b21e7ae2cbbc2c838c21ff265be41b6ab67b80a7ab22b5e168f7bdf843 WHIRLPOOL 8ef9396e60dff89eb92bbb00d3f79bcc69c16a896bb152f4e10ddbd191296c7fa8a89717753752a1a9a5fa3656fb641fe87b135b863addc69698bf0e543abc69 MISC metadata.xml 293 SHA256 917507ed4b28e1337f6a1e7df924690e50daea2478aa3e5d7ca0017e9f1c345b SHA512 35b9f3bf23026a6ca2d5354ea9fe5c05cca7d513e1a84ade3ebe06537353574701fd19d4f74ab4f69ae82ec0bb9f1b126de91a3117cc79a29fb5356059fb285e WHIRLPOOL 17007fffd2f94031ea1477ccb05d5ab663ddc16537a24e9fc00f2ea48be0dd43a64c0ed268e5ef22a87d052dcfb4390758e28209ae1be5f304c736b9a56f2cd0 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iEYEAREIAAYFAlGbo34ACgkQVWmRsqeSphPjSgCfeKPIbTHDoyTJTk9EbNFCShCN -MnUAn2jmQ9nCxziNWsdFQz+8FBTVFHhU -=dm0C +iEYEAREIAAYFAlGdkLoACgkQVWmRsqeSphMBQACdGCSzEtc6t/fNVxsD74sN9mim +9+kAnRmid/5Y9PmpEJ27cBJF1xTmh7qF +=rSTB -----END PGP SIGNATURE----- diff --git a/dev-libs/libnl/libnl-3.2.16.ebuild b/dev-libs/libnl/libnl-3.2.16.ebuild deleted file mode 100644 index 6c0fc92919da..000000000000 --- a/dev-libs/libnl/libnl-3.2.16.ebuild +++ /dev/null @@ -1,51 +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/libnl/libnl-3.2.16.ebuild,v 1.6 2013/05/21 16:40:25 jer Exp $ - -EAPI=4 -inherit eutils libtool multilib - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - http://www.infradead.org/~tgr/${PN}/files/${P}.tar.gz - doc? ( http://www.infradead.org/~tgr/${PN}/files/${PN}-doc-${PV}.tar.gz ) -" -LICENSE="LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc static-libs utils" - -DEPEND=" - sys-devel/flex - sys-devel/bison -" - -src_prepare() { - elibtoolize - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - if use doc ; then - mv "${WORKDIR}"/${PN}-doc-3.2.15 "${WORKDIR}"/${PN}-doc-${PV} \ - || die - fi -} - -src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(use_enable utils cli) -} - -src_install() { - default - if use doc; then - dohtml -r \ - -a css,html,js,map,png \ - "${WORKDIR}"/${PN}-doc-${PV}/* - fi - - use static-libs || rm -f "${ED}"/usr/$(get_libdir)/lib*.la - - dodoc ChangeLog -} diff --git a/dev-libs/libnl/libnl-3.2.18.ebuild b/dev-libs/libnl/libnl-3.2.18.ebuild deleted file mode 100644 index a58ce9cf591c..000000000000 --- a/dev-libs/libnl/libnl-3.2.18.ebuild +++ /dev/null @@ -1,47 +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/libnl/libnl-3.2.18.ebuild,v 1.2 2013/05/21 16:40:25 jer Exp $ - -EAPI=4 -inherit eutils libtool multilib - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - http://www.infradead.org/~tgr/${PN}/files/${P}.tar.gz - doc? ( http://www.infradead.org/~tgr/${PN}/files/${PN}-doc-${PV}.tar.gz ) -" -LICENSE="LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc static-libs utils" - -DEPEND=" - sys-devel/flex - sys-devel/bison -" - -src_prepare() { - elibtoolize - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch -} - -src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(use_enable utils cli) -} - -src_install() { - default - if use doc; then - dohtml -r \ - -a css,html,js,map,png \ - "${WORKDIR}"/${PN}-doc-${PV}/* - fi - - prune_libtool_files $(usex static-libs --modules --all) - - dodoc ChangeLog -} diff --git a/dev-libs/libnl/libnl-3.2.19.ebuild b/dev-libs/libnl/libnl-3.2.19.ebuild deleted file mode 100644 index e7b3419f679e..000000000000 --- a/dev-libs/libnl/libnl-3.2.19.ebuild +++ /dev/null @@ -1,47 +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/libnl/libnl-3.2.19.ebuild,v 1.2 2013/05/21 16:40:25 jer Exp $ - -EAPI=4 -inherit eutils libtool multilib - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - http://www.infradead.org/~tgr/${PN}/files/${P}.tar.gz - doc? ( http://www.infradead.org/~tgr/${PN}/files/${PN}-doc-${PV}.tar.gz ) -" -LICENSE="LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc static-libs utils" - -DEPEND=" - sys-devel/flex - sys-devel/bison -" - -src_prepare() { - elibtoolize - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch -} - -src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(use_enable utils cli) -} - -src_install() { - default - if use doc; then - dohtml -r \ - -a css,html,js,map,png \ - "${WORKDIR}"/${PN}-doc-${PV}/* - fi - - prune_libtool_files $(usex static-libs --modules --all) - - dodoc ChangeLog -} diff --git a/dev-libs/libnl/libnl-3.2.20.ebuild b/dev-libs/libnl/libnl-3.2.20.ebuild deleted file mode 100644 index d09a90f7fb42..000000000000 --- a/dev-libs/libnl/libnl-3.2.20.ebuild +++ /dev/null @@ -1,49 +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/libnl/libnl-3.2.20.ebuild,v 1.2 2013/05/21 16:40:25 jer Exp $ - -EAPI=4 -inherit eutils libtool multilib - -DESCRIPTION="A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces" -HOMEPAGE="http://www.infradead.org/~tgr/libnl/" -SRC_URI=" - http://www.infradead.org/~tgr/${PN}/files/${P}.tar.gz - doc? ( http://www.infradead.org/~tgr/${PN}/files/${PN}-doc-${PV}.tar.gz ) -" -LICENSE="LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )" -SLOT="3" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux" -IUSE="doc static-libs utils" - -DEPEND=" - sys-devel/flex - sys-devel/bison -" - -src_prepare() { - elibtoolize - epatch "${FILESDIR}"/${PN}-1.1-vlan-header.patch - epatch "${FILESDIR}"/${PN}-3.2.20-rtnl_tc_get_ops.patch - epatch "${FILESDIR}"/${PN}-3.2.20-cache-api.patch -} - -src_configure() { - econf \ - --disable-silent-rules \ - $(use_enable static-libs static) \ - $(use_enable utils cli) -} - -src_install() { - default - if use doc; then - dohtml -r \ - -a css,html,js,map,png \ - "${WORKDIR}"/${PN}-doc-${PV}/* - fi - - prune_libtool_files $(usex static-libs --modules --all) - - dodoc ChangeLog -} diff --git a/dev-python/beautifulsoup/ChangeLog b/dev-python/beautifulsoup/ChangeLog index 96b015cc73d3..cff390a869e9 100644 --- a/dev-python/beautifulsoup/ChangeLog +++ b/dev-python/beautifulsoup/ChangeLog @@ -1,6 +1,37 @@ # ChangeLog for dev-python/beautifulsoup # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/ChangeLog,v 1.88 2013/05/18 07:01:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/ChangeLog,v 1.94 2013/05/22 22:05:14 floppym Exp $ + + 22 May 2013; Mike Gilbert + beautifulsoup-3.1.0.1-r2.ebuild: + Add note about test failures with python3.3. + + 22 May 2013; Mike Gilbert beautifulsoup-3.2.1-r1.ebuild: + Keyword ~amd64-fbsd to resolve dependency in dev-python/lxml. + +*beautifulsoup-3.1.0.1-r2 (22 May 2013) + + 22 May 2013; Mike Gilbert + +beautifulsoup-3.1.0.1-r2.ebuild: + Convert to distutils-r1. + + 22 May 2013; Mike Gilbert + beautifulsoup-3.1.0.1-r1.ebuild: + Restore stable keywords. + +*beautifulsoup-3.1.0.1-r1 (22 May 2013) + + 22 May 2013; Ian Delaney + +beautifulsoup-3.1.0.1-r1.ebuild, +files/beautifulsoup-3.1.0.1-python-3.patch, + beautifulsoup-3.2.1-r1.ebuild: + Revert of -3.1.0.1-r1 ebuild with patch, added ~amd-fbsd + + 23 May 2013; Ian Delaney + beautifulsoup-4.1.3-r1.ebuild,beautifulsoup-4.2.0.ebuild, + +bfs-4.2.0-no-lxml.patch: + Add lxml to IUSE being an optional rdep, switch lxml to RDEP, add use lxml + to metadata, optional rdep html5lib blocked by Bug #471002, re-add pypy2 + support to 4.2.0, patch to fix tests for 4.2.0 *beautifulsoup-4.2.0 (18 May 2013) diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest index cc5ca6ff8852..cce637b419d5 100644 --- a/dev-python/beautifulsoup/Manifest +++ b/dev-python/beautifulsoup/Manifest @@ -2,28 +2,26 @@ Hash: SHA256 AUX beautifulsoup-3.1.0.1-python-3.patch 42319 SHA256 ff316866451fa89bcd55f2a12590960df0d1c5b099cb94ca8e2d684024536a97 SHA512 7e29d0cfa4f927c9df87902adc7bd037ebeb9f2389ace2370253e453309bde7dd4a58247e24e2caa0cc2ae73ad65480973fed6397bb987bf9715fa4515dac1c1 WHIRLPOOL bcdfe4f601fb69f579bb55021c244cb9861946bfba8253c5ab5ed5426266abf798832c8eacc5208bd2e0baa9ccf0e6f74eded73e76289c5560891b86b557d489 +AUX bfs-4.2.0-no-lxml.patch 2462 SHA256 d28f5b8d33a674e6349fc5376a30d2c74a8029a7839e7f13a7701fc9a20b5563 SHA512 4d6f1db9cff0007c824340da94cfa001a7afaef2cbc6ce95f669c72221ffeb2a975688f449bd66c0163bc90328329471577d8562e31dabbff610f30bfd0a8592 WHIRLPOOL f495c2588dd7a3d11d0802212d072b3d0ef02d8c55edb9546b2117d7867b0ebcd4a41411f3a2de9e34f57db8e72030b3e290dbe60300bc4bd8f2b94d1f5193e1 DIST BeautifulSoup-3.1.0.1.tar.gz 71460 SHA256 820a80f473240d9d30047f36c959d530a699a732500662dd8b03e1d3ccad12a8 SHA512 812969faf454a58d849921836ed07ec9a950f34fb31e29e118cdf1a75a533370e430f417402b5a5016d23b2d3a1c44a1cf5fde5b3bfd1bc98c50036edd51c0d6 WHIRLPOOL a199585817dcabcc6327c3836a66128605ebf92a6663b5c660125061a797485a504d300791bcd43e0e94e4f08ca59c01f65f42481da07b1240350cbfc6ea6b0c DIST BeautifulSoup-3.2.0.tar.gz 31056 SHA256 a0ea3377a1055bf2e17594c0808414afb65e11f25ce8998f1ed3e9b871de6ff6 SHA512 2bee35d0d0f3909eb09fe74c5ed1ebccb9fa134e200f5e9f00266fe1f3453d1794e920dbe4129fd3f445abe19a5acaa7dab207b2e752ac0102ae5fd9441df8ce WHIRLPOOL a537228dd5b686fd8d033eb4329ecf79fdcdfaf9e5ec4eed9a2b25aba0f41ddc980dbca6cefe26b24b721a0fe0d4804974b504767e034eef35c07ad99ef51f37 DIST BeautifulSoup-3.2.1.tar.gz 31224 SHA256 f5ba85e907e7dfd78e44e4000b3eaef3a650aefc57831e8a645702db2e5b50db SHA512 365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789 WHIRLPOOL c2f84b29421d0153fb1fecc87d63e00a61182e03bc0683132babca5d6c94143b4875a60a19124a36e4e6e78ce80bff9e1e81b37335700efc14084da933307e26 DIST beautifulsoup4-4.1.3.tar.gz 131292 SHA256 a295b93b30e1126f3fd64edc106f6939349280dde2ba47cef1e5a92dad9319bf SHA512 79ed4f65bcb5599a0d278d5462a67e80f532cdddcb753e0703b28347d84512165ee0bffd09795a501f3b55e6e4869354f04efdceae9de9093a4d85381fee660e WHIRLPOOL 53713ca72b5a409b3755e28d69de65b7994fb387d21ba9a1827f3e4dda2355f318660f69a706825ecb3852447823ffb8bae2cee6bacc093e6ad73347852f29c6 DIST beautifulsoup4-4.2.0.tar.gz 138400 SHA256 9565ce6f6d28808007ab6248c37d59a49934e358276da5d3ac211ea1ccfd0782 SHA512 50c7514f2a1de49df6300d292e1f00e746b341e9c70dbfc3508663870ddf92f5c8e0ea981dc7742f888428845e90bce2cce8b158e8548039be4c2c06ee76db97 WHIRLPOOL 95db573c6c291d27187af9403694bcff27add7ad378b105df96f988074480b7a1491710681a93f1396dfa33cfa8c493637564ab7fc228e9e92659c385aa769a2 -EBUILD beautifulsoup-3.1.0.1-r1.ebuild 1322 SHA256 1842b02302d10443ccb2fd8936fcdcc27ea4f13b0a81b65c96e5cbfaa7aa4b70 SHA512 ce26dc242f5c0e8535431dfc30b67262f628f8431fe4cd6c7cc1ff7ff79c41e5d7c050300bd4598d7e0e7125d099008ac47f0641cbd95cc5297495cd5293c316 WHIRLPOOL 764fbfeb89a37d8ad8b0891343f9e992edff735d6108281f61c83aa14978239bc8a3a4da19f7bcdbb19c447cdf638f13596cf2c6891b28786d9e84aad8e6ad13 +EBUILD beautifulsoup-3.1.0.1-r1.ebuild 1334 SHA256 971b753d3b0a731a9709e3c841db8cbbc1c5cf8f33099afa234e4eb1415be34b SHA512 bf6d1bec2f6838adf29539375df911e228b0acc35868c3fdb3a1e939c31620b04b1e1a75aef05f11b937bb25f3e181cae63f760df190e57e7003c761c18ea8ea WHIRLPOOL b101128aeead9ae287e33f59e5d2aaf7e1319104f8d60fd4ea000dbb8c611081e431bf27819134ca3ffc709aa1b33f0a1f73e35326cf872b009bc10e54a03085 +EBUILD beautifulsoup-3.1.0.1-r2.ebuild 1181 SHA256 8354df823e82d8985715ad8847253a68ab52f37b15a90058c493708b1b91619b SHA512 c96dd1a5664531080195b014de980c9864d89ba8b3246d14680b00fe740b8d7ff4c645f655ae7d8d22dfb6c7c19c2e0811baf46b636e8c2a17c274ba95e2736f WHIRLPOOL 7e10dab38001f33dfca2d0a5b2f48068e11a7fbe9644d317cfa7c2f6b53649ca07087c658829287244fa81e97298f7ee6ebe3c1b7086a8374ca0aa084c734c45 EBUILD beautifulsoup-3.2.0.ebuild 1128 SHA256 562ccb3c02dedd76df2e0853bf040443b94d44450162daa39339f00adcdfb82a SHA512 b54870de0e10b191d90b17a7695eb74cad253a6a3f06621cdd86c722bc4ffba2f0d2e216c8d3da13d4a4894d2aa5c08f21299748351224e21772d985fcccfffb WHIRLPOOL 8aeaf761c91bd819860a68b910d252e07e55a0461b3d5a75ecbf0edcc051d43f34cbce4df6b5a0aa0d182b727d8e5b5d807e7091ff1d206bd3411f3a711bb814 -EBUILD beautifulsoup-3.2.1-r1.ebuild 1009 SHA256 1800cc0ed032ee002d4f29ca805e2c0abd6dd81954a5aa098e37bd3bf843fb95 SHA512 379e343e470447eb37e61c40c79692a44e17b0b6f3d12f6d2663d9cf2d47ab00ccb66e6ea184502bf40f755277b16eafb53685efdaddbd1dbe36649fe5370327 WHIRLPOOL bc3b3d3719d90672f8492c6df4d74ac09330c370b1b8653e8c3d02f9b73a5971a50d5fb3b1b13fa9c986944e2495d228841ae1e901a0af4b2481735406e1e732 +EBUILD beautifulsoup-3.2.1-r1.ebuild 1021 SHA256 0a5b9d5b772fd92aef2f4d8e03d6c8579a6a37316ad7e876412ce9c4e45855b6 SHA512 f32b8808150a5a46dfae4df03811392cb7643c605df3456474eeb16a7bd4e7df63c74e352b80dbebd01ce44485f3c6d3127f361c4772d9644bf33780b55a2d0d WHIRLPOOL d3dc6dad5a64221679fb03e82dfa07a39592fb510ab7e127d0d3e8b1b25c20f3ea96c2fec92b553caf65cbbf1bf6d79d3c76cb5a144ba988f5a761d5a2e36a7f EBUILD beautifulsoup-3.2.1.ebuild 1136 SHA256 7f64d7e6d2877eec779d5df93d7612647a205ef62b066c7aee5606f7cb080d52 SHA512 6fa414de24084e6cb9f37db24fb40c8fca01104ccefe7114b5d880899284fa12aed02d25cd9247ed9ce0d0780bc234bfd68347638d8beef9c39d82ae9a8f11e7 WHIRLPOOL 154e07b1641bb6c73151fa2f7fac00a273ca20f6fb22129876ded9c8a9101437e66f44a49d74bac70290a2bbead9d123deda55322fdfe544235666c2b97125e7 -EBUILD beautifulsoup-4.1.3-r1.ebuild 1284 SHA256 affe563f8db2596b0c5acf71092dd8cd22147ea70c8603b32cb01c2246588998 SHA512 3fa663b4a77754d758af79da0fea4def7ade81f7f05980f5d9cfe9f7f9199a41a5b02adaf91b9c907b6308bf4cb4e97c883332076f57820e5c62855dbe1a7842 WHIRLPOOL 3b6feef4a1d758ea6f3bcb1f7ea8060086d548aa60fb41f04af5efa1455fa2f1d260c22690bd90e84bc2cb4936603915194e4706f0306f52d8ac6dbc177c8d74 +EBUILD beautifulsoup-4.1.3-r1.ebuild 1452 SHA256 d46c9f919b0460c038eb013e3ea05fddc97f17352913795760ebef7c15523c36 SHA512 966af88aaccaec31484877584ddaf4dc6e2fec97a146dae84dd19381823289eabad54d48472f300cf55fdfc4131c98fc66606edfd2d93d3a79b99d6ec40fd6f5 WHIRLPOOL 831c935f2015b3730d4b6e90ff7e50a7cc5f8b265470ff138e2ab2fb63b41f81fb915c3bbcdd8cc1c60cebbe016982ca55ba3efbbf47f08a4e5d85edd8e4eda2 EBUILD beautifulsoup-4.1.3.ebuild 1373 SHA256 213867555347809a1fa6e5c4e9a41a1459ddc17d0cc6a763a6f53f92de251b47 SHA512 38bee8dc5953bfcc6ef1e9e0a30dc52463c07b088d6f3cbceafedb1e7981f3873ef7a0645b99c9aa86a15a021127e48b76666de4675a5bccadf43e5d16f9f0be WHIRLPOOL cbbf07d608bea1f533aad98e13a7169e30059cbe47c23def7b0e6406ccfee0c4de96b6fa04593d383e929bea958a5fc3446a669a70295dffc8ea8888a89c833c -EBUILD beautifulsoup-4.2.0.ebuild 1262 SHA256 8e5c585ff7124c1678f03c5e4c623b37cacef011558ac06aefb0018812176175 SHA512 862161e93cf187ab62a6424f151a7df4ae31a411d4d471f8ff8716eeafa72d9e4b8bd2ec0e073d586f3185c45651558d07d9b814ac71ff4340aa5fc6fe4e7b73 WHIRLPOOL aac7256e3ee8c9344527e79e6109a3fe4ad19dedbc23d97d1faa63e48cfed2f12d31206b9494df6a4ec58b0c41a110cad0eb2373e9496d4cb2c774149c6b69e8 -MISC ChangeLog 12047 SHA256 474be0b21284a6a09a9a18767efcfbdaee0e60e0b86d101e0945197ca9423030 SHA512 f2a5a9180e9cebf8e0a6b15ad5ff938912fddf50c53dd60d5e40195e04741cc5a6b5982a6f1e3b4d95c1758065dcea45fb9b629f2bd941c71709c815a3d9923d WHIRLPOOL 4ea37c60a59486b0f378cbb61b8c6e1007b1a7a0ba474ff9b0b50b6862d192623d73105096da5f1015d5c374c3eb55fe13585d07ab02561b48b9b0c330eaa516 +EBUILD beautifulsoup-4.2.0.ebuild 1529 SHA256 d1640ce16d966a819c25045991ac1e5e167f7a88db35b8095d67fbecf6bceed3 SHA512 0f9c323f8fd74854c4dd30cc0b26511a4f187642e5009ba0d034f45c6471e330df4973eb8058d77cbb0c7c4968d2d90ea28287900b7bc7738e3a84cc54db9560 WHIRLPOOL 964c59222708e594563c39edd5c7e56bb3ed17f65f303f3a9aac692ba6ee571b231669819c6c06e813010c4c120624d77240d0b8c6562e9f82eaed25d2af5188 +MISC ChangeLog 13191 SHA256 b37a79e6f83f98d928aa11d4d49e37db9999d7bd6db983e7318d3bb011a9b47c SHA512 6873819ee5d03fd395db44d6c8080e6b2f2b5aec9a7605e30f4a183218d5b5addad24a24d7658dfca4750d6d11c6cfd56efeece3b993ddb514af642874153b9f WHIRLPOOL 90da259a944a400d4b7eab1700c74f36285f6251dc0f6a41582349db66245b63945b14ea1b198197f675eb2adbdc3c607111c2db7b7d1bd6b35e799c3e6812f5 MISC metadata.xml 640 SHA256 c24a9868c6b553732e13ee16e41586d8003da55cbdde41d684e4260108f6da51 SHA512 db0d5d29bc3a9de492c06a8c46d34797ade006804ade98b889acfa143417d4aca83ae0b0e73e0207a602fcc3bf0a96d3bb6b60a083a5407e3ab700dc4c4d9433 WHIRLPOOL 930aeab34aca3409796fc06941389e6d3d65f666abe6b30033b5da7af1fa78fab8c16c4190d0276e936c20ca6f0a14929815acd32331f3017458f9ff94bdd456 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.19 (GNU/Linux) -iQEcBAEBCAAGBQJRlyc3AAoJEEqz6FtPBkyjmIUIAJyFV5NAXvniCvN+yGCWxc8M -lH4qKH/z/WygirMDucF7TbAH6cd9q2gqtMwpYmpM92jHpx44hUlYhcIRfNnd2dmU -R56q0oVkTuYham+7Z3zwvzXyJErgxneNDFFSA9qMdkjiJGfZKEe9lA+szKkMB0S8 -bcO2TgQEkCyMr4+bVT+ZEvsL00p3j26gmjPRvrSmM9W9jqaZ6tp4eDVgrjASJblh -f2HBVmeBuQryJyvIZE/MClZfXSPfxtC4/qmTVcEjWBZBzU2hhBSpDH6qyNKEdmXE -yc/Tw/b2r1Lo85qw1HzFxv4WQ6uU9XLQcd5DG7kD1bULJ1PxFnbzZhSpyYyZfCM= -=guvV +iF4EAREIAAYFAlGdQRsACgkQC77qH+pIQ6SUdAD/apr9QTwVw0IR6SMH1itfjcv8 +T5LhD+SV9d928kD7DN8BAJYMhx3PrQiERLEHUBwHe/pQcw3mv2lGwH33HKacWThT +=EL8F -----END PGP SIGNATURE----- diff --git a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild index 6e1bdb067e77..ffc120422dd1 100644 --- a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild +++ b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild @@ -1,6 +1,6 @@ -# Copyright 1999-2012 Gentoo Foundation +# Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild,v 1.16 2012/10/13 18:41:14 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild,v 1.19 2013/05/22 21:49:29 floppym Exp $ EAPI="3" PYTHON_DEPEND="3" @@ -19,7 +19,7 @@ SRC_URI="http://www.crummy.com/software/${MY_PN}/download/${MY_P}.tar.gz" LICENSE="BSD" SLOT="python-3" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" IUSE="" DEPEND="" diff --git a/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild new file mode 100644 index 000000000000..c7199e453631 --- /dev/null +++ b/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild @@ -0,0 +1,37 @@ +# Copyright 1999-2013 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild,v 1.2 2013/05/22 22:05:14 floppym Exp $ + +EAPI="5" +# A few tests fail with python3.3 :( +PYTHON_COMPAT=( python{3_1,3_2,3_3} ) + +inherit distutils-r1 eutils + +MY_PN="BeautifulSoup" +MY_P="${MY_PN}-${PV}" + +DESCRIPTION="HTML/XML parser for quick-turnaround applications like screen-scraping." +HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup" +SRC_URI="http://www.crummy.com/software/${MY_PN}/download/${MY_P}.tar.gz" + +LICENSE="BSD" +SLOT="python-3" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris" +IUSE="" + +DEPEND="" +RDEPEND="!dev-python/beautifulsoup:0" + +S="${WORKDIR}/${MY_P}" +PATCHES=( "${FILESDIR}/${P}-python-3.patch" ) + +python_test() { + "${PYTHON}" BeautifulSoupTests.py || die "Tests fail with ${EPYTHON}" +} + +python_install_all() { + distutils-r1_python_install_all + # Delete useless files. + rm -r "${ED%/}/usr/bin" || die +} diff --git a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild index b69286f71d4d..b447772826eb 100644 --- a/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild +++ b/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.1 2013/02/10 01:23:11 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild,v 1.2 2013/05/22 21:59:18 floppym Exp $ EAPI=5 PYTHON_COMPAT=( python2_{5,6,7} pypy{1_9,2_0} ) @@ -16,7 +16,7 @@ SRC_URI="http://www.crummy.com/software/${MY_PN}/download/3.x/${MY_P}.tar.gz" LICENSE="BSD" SLOT="python-2" -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" IUSE="" DEPEND="" diff --git a/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild index 042a0e937eaf..537781041e5d 100644 --- a/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild +++ b/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild,v 1.6 2013/05/03 07:07:04 idella4 Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild,v 1.8 2013/05/22 18:52:53 idella4 Exp $ EAPI=5 @@ -18,12 +18,15 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="MIT" SLOT="4" KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +# new html5 awaits keywording of html5lib in Bug 471002 IUSE="doc test" +# pending Bug 471002; html5? ( dev-python/html5lib[$(python_gen_usedep 'python{2_6,2_7}' pypy2_0)] ) -DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( dev-python/nose[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] )" RDEPEND="" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] )" S="${WORKDIR}/${MY_P}" diff --git a/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild index 35f90600d2a6..3be2ae4a6416 100644 --- a/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild +++ b/dev-python/beautifulsoup/beautifulsoup-4.2.0.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/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild,v 1.1 2013/05/18 07:01:07 radhermit Exp $ +# $Header: /var/cvsroot/gentoo-x86/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild,v 1.3 2013/05/22 18:52:53 idella4 Exp $ EAPI=5 -PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} ) +PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} pypy2_0 ) inherit distutils-r1 @@ -18,16 +18,20 @@ SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz" LICENSE="MIT" SLOT="4" KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris" +# new html5 awaits keywording of html5lib in Bug 471002 IUSE="doc test" +# pending Bug 471002; html5? ( dev-python/html5lib[$(python_gen_usedep 'python{2_6,2_7}' pypy2_0)] ) -DEPEND="doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) - test? ( - dev-python/nose[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - )" +RDEPEND="" +DEPEND="${RDEPEND} + doc? ( dev-python/sphinx[${PYTHON_USEDEP}] ) + test? ( dev-python/nose[${PYTHON_USEDEP}] + dev-python/lxml[$(python_gen_usedep 'python{2_6,2_7}' 'python3*')] )" S=${WORKDIR}/${MY_P} +PATCHES=( "${FILESDIR}"/bfs-${PV}-no-lxml.patch ) + python_compile_all() { if use doc; then emake -C doc html diff --git a/dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch b/dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch new file mode 100644 index 000000000000..75ae98b1ef45 --- /dev/null +++ b/dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch @@ -0,0 +1,67 @@ +=== modified file 'bs4/testing.py' +--- bs4/testing.py 2013-05-07 12:19:02 +0000 ++++ bs4/testing.py 2013-05-20 13:19:16 +0000 +@@ -464,6 +464,18 @@ + self.assertEqual( + soup.encode("utf-8"), markup) + ++ def test_formatter_processes_script_tag_for_xml_documents(self): ++ doc = """ ++ ++""" ++ soup = BeautifulSoup(doc, "xml") ++ # lxml would have stripped this while parsing, but we can add ++ # it later. ++ soup.script.string = 'console.log("< < hey > > ");' ++ encoded = soup.encode() ++ self.assertTrue(b"< < hey > >" in encoded) ++ + def test_popping_namespaced_tag(self): + markup = 'b2012-07-02T20:33:42Zcd' + soup = self.soup(markup) + +=== modified file 'bs4/tests/test_lxml.py' +--- bs4/tests/test_lxml.py 2013-05-09 19:36:30 +0000 ++++ bs4/tests/test_lxml.py 2013-05-20 13:19:16 +0000 +@@ -10,6 +10,7 @@ + LXML_VERSION = lxml.etree.LXML_VERSION + except ImportError, e: + LXML_PRESENT = False ++ LXML_VERSION = (0,) + + from bs4 import ( + BeautifulSoup, +@@ -47,7 +48,7 @@ + # test if an old version of lxml is installed. + + @skipIf( +- LXML_VERSION < (2,3,5,0), ++ not LXML_PRESENT or LXML_VERSION < (2,3,5,0), + "Skipping doctype test for old version of lxml to avoid segfault.") + def test_empty_doctype(self): + soup = self.soup("") + +=== modified file 'bs4/tests/test_tree.py' +--- bs4/tests/test_tree.py 2013-05-14 12:39:16 +0000 ++++ bs4/tests/test_tree.py 2013-05-20 13:19:16 +0000 +@@ -1344,18 +1344,6 @@ + encoded = BeautifulSoup(doc).encode() + self.assertTrue(b"< < hey > >" in encoded) + +- def test_formatter_processes_script_tag_for_xml_documents(self): +- doc = """ +- +-""" +- soup = BeautifulSoup(doc, "xml") +- # lxml would have stripped this while parsing, but we can add +- # it later. +- soup.script.string = 'console.log("< < hey > > ");' +- encoded = soup.encode() +- self.assertTrue(b"< < hey > >" in encoded) +- + def test_prettify_leaves_preformatted_text_alone(self): + soup = self.soup("
foo 
  \tbar\n  \n
baz ") + # Everything outside the 
 tag is reformatted, but everything
+
diff --git a/dev-python/cython/ChangeLog b/dev-python/cython/ChangeLog
index bb05d0f7dc15..2a4290995b27 100644
--- a/dev-python/cython/ChangeLog
+++ b/dev-python/cython/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/cython
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.93 2013/02/16 22:07:28 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/ChangeLog,v 1.94 2013/05/23 08:26:53 patrick Exp $
+
+*cython-0.19 (23 May 2013)
+
+  23 May 2013; Patrick Lauer  +cython-0.19.ebuild,
+  -cython-0.14.1-r1.ebuild, -cython-0.14.1.ebuild, -cython-0.15.1-r1.ebuild:
+  Bump
 
   16 Feb 2013; Michał Górny  cython-0.18-r1.ebuild:
   Enable py3.3.
diff --git a/dev-python/cython/Manifest b/dev-python/cython/Manifest
index 23dda4a62bc2..3756d925ed98 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,31 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 0.15.1-test.patch 2334 SHA256 c8e0ddbba1166d367dbfd26cfc870cff2aac329eba9474481863408ea3259bd1 SHA512 2ae26b6d3dda11067f6d52431b0a1d9a5d9597db2bc90604b930f8e9e8faa7913e883b5dca0d9d862dc5aa732a6d771b460df12b0db8c1beb4a2f7b1a2a3ba0d WHIRLPOOL bd684b1f32744cf6a1b582b0197c56743e3c30f36647cd81090c2568958d1e56bf44f197446becddfeabdf25f7678bfa3a79eadae0fbcfa97312d82103752b57
-DIST Cython-0.14.1.tar.gz 1315824 SHA256 89e3f64ea0f97cd29b28d0831a7022dc1f8cf4ffb7be52b9f2fc4b5dcf9243c7 SHA512 1af6ee35722fdbfa252782e1ddd0b457c2f742a326d582b0d187641450977b5437b867f559ba10750b80d20d6dd18baffeb54b1b919ec75861bbc6d771721328 WHIRLPOOL 37aef51ef3b8ac0041c13975166b923d6a263b1dcd65b1ba461841d4e0331b3e5bdd47b8740cfbec0bb368b34e54edc4fec3e16fc01b82eafb3f3ab6794bef40
-DIST Cython-0.15.1.tar.gz 1796536 SHA256 248123f2f02f2701a28d9452132ac835533b396a273cda9d361cb65c26067edc SHA512 8da1b0af98203254a1cf776d73d09433f15b5090871f9fd6d712cea32bcd44446b7323ae1069b28907d2728e77944a642825c61bc3b54ceb46c91897cc4f6051 WHIRLPOOL 9c0f5bec9f8c9e9789d581b15c6940b0555e454d42dca06b4161bce5789a7d9907d6fea1a3c36b8235699a58de984f0c328701dde60e7b9282b7e632f55a96d9
 DIST Cython-0.16.tar.gz 1240372 SHA256 971651fc5d3c943b0ecf7bc4df86a977bf62623d94542bf2aaa5f7223697e6fb SHA512 2c1933ab31246b4f4eba049d3288156e0a72f1730604e3ed7357849967cdd329e4647cf236c9442ecfb06d0aff03e6fc892a7ba2a5c1cf5c011b7ab9c619acec WHIRLPOOL 3d16dfd2b885e44270c0592b9cec7e43d1cf5ccfe1ecc59881042d21be4ba0d8d8eee729ce6f20b8a00db69f51d7278b99545b1cb6195157683c00d5a833d5ae
 DIST Cython-0.17.1.tar.gz 1283146 SHA256 0d631b67d73aece33eb98c70257adf946e1e5b31633d701c3fcac2dcf42f0e84 SHA512 eda1b8090e5e21e7e039ef4dd03de186a7b416df9d5a4e4422abeeb4d51383b9a6858e1ac4902d8e5010f661b295bbb2452c43c8738be668379b4eb4835d0f61 WHIRLPOOL d40628c9344adf389ce8493abedb767b4b083c3f6f03c7ec87d782caba4abb346f587dd770b2ee72521e3fda6b87f3cbaeed063f97d3eb45b06a52bfc559772d
 DIST Cython-0.17.2.tar.gz 1288282 SHA256 ea1a3147d4d952e793a1043d8802ea67747892fefe7fb7e5c0cfb8bf51883be6 SHA512 03b4d03ff848b660b9a0e0c39bb48173945c013b7bfc8b32638633d7bbeaaae6ac1cb2c26ddd6ae3f15303cae8c49b611501cc7dbc23def193b4dfada7efd4fa WHIRLPOOL 72bf126a1088dd73c85a964f329ab6874944cba5f6be9a096740d7197f1ddc9fa89a64b1beab816afef0d3203161e7766eeaadcde9a97133cd9e79a848470cf8
 DIST Cython-0.17.4.tar.gz 2214803 SHA256 aa7a9f9432d15ee9fde2ac49e6f6fb9b74d0c21177e3ba8f023251c8b4a80b39 SHA512 3091a99f259b3ff8b62c42db885473ea5d92ff671042eebffe8e320333f2825e18edc71a9b9dab1012e4d2f3a18c34f456feecf915b44585d14013801382d8b3 WHIRLPOOL a7036a08e18fd02f1b2439549c5147cba6ea0ac1bc64455c19ddf8505694f7ad3f732d31a7dc13e8d157b5a4dd86c01dfc2e4b691576125bd77e04f18f86ff5c
 DIST Cython-0.18.tar.gz 1317041 SHA256 cf4ad7faed6bcfdb76da42492ce26ebf927129da3d4849d6982dd2e843d7de8c SHA512 fb85d71bb4f80b35f0d0f1735c650dd75c5f84b05635ddf91d6241ff103b5a49158c5b851a20c15e05425f6dde32a4971b35fcbd7445f61865b4d61ffd1fbfa1 WHIRLPOOL b096d009792bc021b8fb88eea6f587877d72d86aca76670400fa892da3f59972cfec63a6afb6d0244957b7c05017ee17544774c126cdaf4f56c49b149f266946
-EBUILD cython-0.14.1-r1.ebuild 1433 SHA256 a8399a7258a14d773a9d67544e71d6a505e1ac9272ba1fa6bc9659dfd048e107 SHA512 4bee137959ffae0ae5d2af8bf693f3f347862278d0e071f5e23a18997a9381711c57fcf504daa19d6481c128308d37cef47e39eca327e25b179f763afe001fde WHIRLPOOL cf86995e774ccedbdf2380e9c3d2676f6043b920aa69a35fc9d0dd18dc3defaa7936b54428e74b621073f3dd1d041a575ead4317112d25addfe7ee928d41cea7
-EBUILD cython-0.14.1.ebuild 1361 SHA256 86951d0f96c5f6d6657612aa8824f4ccd4a160eef3f147697110561b09e8a15d SHA512 0e4f6f2c80247c6bc0bf9a037e65e6a644bbb9d3182e034014906725f0aee7a16bdcba3e134096c6f5eed34cbde87ba6f86970674bbededf8ce907741238cf0e WHIRLPOOL 57072dc7faa68b9642aee46a4b8ea6095c220316d9fc07fd258ba3d9dd3b9980780ae143379660fbf1de75851f7acefc6e7623af119760d712b7f29d44253bd7
-EBUILD cython-0.15.1-r1.ebuild 1550 SHA256 c7b6d2c73e82cd30ca7cf3b53bce4abd14f5dbfb9345192af8bd2b9749263c6a SHA512 6c6a25811424e0594461f17f6a39412bea1bfe0ebe1ed34cc3eafea7b2378b00109587b0d2504ed850893a3433163221410257105fe557037c972732a8c39a4c WHIRLPOOL 238bad76c2b4b9374ba6a645b1a57d9a682aa4659638d46bdcea088416d11efb2ace47765765bc33a3d4cd1bf1b19d13d2a39044a96ab75d04342dec5c3d3e23
+DIST Cython-0.19.tar.gz 1382384 SHA256 2f861fbb2aca49a352a5cf00a65d4383b7ca56a60b50ea813e59a7a9ae6cd7db SHA512 aaeccfce6ff1a185ca4fcb6f704e963be2f984e7e626053f78ddeac1f137caabb7d4d3de0fd3d7fd99b418bbfdbadade20c0d58f364ca39d1801ad15989bbe57 WHIRLPOOL ee4f45eaf03e48edc4489470a8e0ef72c6be13a99a9f2174fc57830139b98b8770be4a8a7f2717a004cf3b8f79bb11a9870831753e441bd77243e29aa9764d5d
 EBUILD cython-0.16.ebuild 1483 SHA256 ce632cb30285c004f0bf1020a03d01d441d3cf8c87103059aa451fcfa33a92ba SHA512 8794d8d3cb5a4ed3c33db4c386bc23c0d8caef1fbd624a302c258167784e1b4187580937d163db05fd32b75c8588e182322da5299c8d54e1234f5f4ea03d21c2 WHIRLPOOL 3135ee8ab0c76ae1a09cf60f0833d4cacb3c9532bb758f857ef344479b1e380c488cc4a55176b460585da28ab3f6a9e22f0ab32957e92bf5975fb30f27aaf752
 EBUILD cython-0.17.1.ebuild 1494 SHA256 6bb4214c9676b5de63969ff043d9d9b64fd02a70635f6add42ff8e92b940ca9c SHA512 de2825e0117257cde8e25a6b4c3ba645f7a925b91cd750687c663e72f4b752de18a155a02c308d1708650688fd44655faf6bb175dc28c81089b1eeb477a8d18a WHIRLPOOL 76d53167eff31729233fdfd257e83170903ff3638ca6027ff4a7f51c3673bd427e8fc9448201e20e0463fd8259e8bc5c5ed3b79a822e3cf0240e1b31a322c1f9
 EBUILD cython-0.17.2.ebuild 1494 SHA256 cb9006fa983ecd98863f65a5c9e4caf783c7f4596938b7297ae8ac8b33c8dd22 SHA512 a02bde480e9e5ed92feb6917f0ef52c9f7a2e30c79f0c58f0769a91bb14916343f8d9c44b11991d6df8f3a1d7169fdea4de88ca3067e6cf50950086c9cdfa848 WHIRLPOOL 6b894dafb93bb1369c92460558e0bb876c08314561f544bfe981a8bdad4a1e69641eb62dbd7fb3c442a6ba43e42c2f151a35d1e6ddbe24dc8860422471446cc8
 EBUILD cython-0.17.4.ebuild 1494 SHA256 88df87a07a8441917e35b2eef43f4ddefbe5962d60aa808a582ea5007edf4b7a SHA512 d9b635fbe051f924a69c5b60f50bf85f2469f9215147ef3e9481e4b8ae9d3a9bad109ac289b34e47f54d2c0323502742ac9e44d855946887f8730ecfb36c4db1 WHIRLPOOL c2e41ab0bc3df825eef06e1b733da993b5e331620e2572587a880c17c52f374c5f5095ac8430fdec1faa9e07d297d42f0d0649ac1bed9b11a8b45b9c6235e56f
 EBUILD cython-0.18-r1.ebuild 1554 SHA256 cbce628955ae43499d2a4a0618b10fd3ea10ec1f21cca9e4fd44f76d3dea9ae2 SHA512 a475c0cd8db593aa2bacb95a27bf8cc7fbef7083645f762228bd5b144eb6dd4c986e00730371693a4a8356e40a51f7fce727c59b8948e9db84e24b64af1ebb1c WHIRLPOOL ab694920001012317c3f848714d7ac6b2bb525257bb7496d1db66d393ce917bc574289f1969bad21ba487b5af12687de73f532196c6cef619e8e388d035ff179
 EBUILD cython-0.18.ebuild 1492 SHA256 636270d38c94ff85133be86ac12d35da418b245cead20826843996f9b78e55c8 SHA512 743db0afed9439992a00c3ab31b001c7510b47155b83bc9199843a13e0eb3636d928156f2489ff72b8d95aea63399f7731e57369f4ce0c0a745b5e690ec8d16a WHIRLPOOL d08c1046047c1d23bce8423b6bf5366a549c2e935946756f342a60ec74fc5fe8661872144830d16ae1ab9042d113621374a6c69cc141d6caaa18956ed1b7a839
-MISC ChangeLog 12275 SHA256 318a4e353e5864496e80c161b9eb7d87d8a553e9fb1441ab933e7e9b4f9b092b SHA512 e7254473cb4464a63dd8a64fc444e876ac9e67b737b82e15e920e52824dfd55441d52535f3c9bf65ea7d475c774ed638fc914ed35879ea46f61518fee8483e86 WHIRLPOOL 634e014713a7e1f60a0fb715448e5dec5cd592726643cc597149f4834b84aff4594da1e245a5abb65cba06d807258e14cb450e887c571d0f6f50c10d8db8dea3
+EBUILD cython-0.19.ebuild 1552 SHA256 0e01767269ca3724f44293070680832bda50c3ceaca1d996b232cce45aecbd6e SHA512 2848e86ae8203009f5347ec1ca453bf90e1db1d14385a113fda52fde681766766b2f06f257cc48419d44ebae7c12fa08e18b5d86b4d927bbb22844563ae3c9cd WHIRLPOOL 0b52c43b80855c0c948f8f59611e55ce782d643b463c4d180004f019a747b6357efdd308f5ac08a00eafadc4646d70ef704cfc6f30f70acb31cb90c3db722bab
+MISC ChangeLog 12460 SHA256 5ea97b480d3060ac89d4851bfc2d16865737560321efb297bc48bf0976d0d53b SHA512 1395149b560b72fe7ae8d4f0e492c7845334a14f45ed86e5b31641495aa554bbd9442671da51a82184703c086f9cde5a67f8ab493d518bfa3e4424a393c79020 WHIRLPOOL 8d03675f332ad4b7bedf99a7e8ae23f33aa884a4342f818dd49ac54257da1a1176b2ec7718d9974669b3074818ea5fd162e70865c6d202931575aa3e4d20e110
 MISC metadata.xml 507 SHA256 0756ee0b23317a871b1fa05f5a8fb86d39ca0820cee63ded86551f8b76cb7406 SHA512 f51a7395e924eea4db4f342a8b28e5f93eee0773fd4558607ceaf9844861f8b16858e10937851f589011323d903551dbab8a53f4b7cabc94a3ff4d2cba5dcd9a WHIRLPOOL 82a4811a17060a51a743b2f1ebbc65df575f2c772374666f2d36be2050ab7dd3c3fecc9de96a3d20a25cf29e8be84789c376f815e8b40e2433a774df79d61dd7
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iJwEAQEIAAYFAlEgAy8ACgkQfXuS5UK5QB1+lgP+PcDVqBVQ2G4s8Yl51icc21B6
-11lV8U1NVfyZAebb6VUSHcdTKrTO3IxYmRMAkzmVn09BmhjkdeMsGQDLpRlkOXDu
-bmWc5ksb9Ti3tGrPotZKrNOv1y49m4ey4UOa/xSDhtSRPO5w+PDBxOwsfWSLPw4L
-rzxVd9T2CIxGmbiv9Vw=
-=F8Uc
------END PGP SIGNATURE-----
diff --git a/dev-python/cython/cython-0.14.1-r1.ebuild b/dev-python/cython/cython-0.14.1-r1.ebuild
deleted file mode 100644
index 788c7cf524e5..000000000000
--- a/dev-python/cython/cython-0.14.1-r1.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.14.1-r1.ebuild,v 1.1 2012/03/31 19:13:10 floppym Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="The Cython compiler for writing C extensions for the Python language"
-HOMEPAGE="http://www.cython.org/ http://pypi.python.org/pypi/Cython"
-SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="README.txt ToDo.txt USAGE.txt"
-PYTHON_MODNAME="Cython cython.py pyximport"
-
-src_test() {
-	testing() {
-		"$(PYTHON)" runtests.py -vv --work-dir tests-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/cython"
-
-	if use doc; then
-		# "-A c" is for ignoring of "Doc/primes.c".
-		dohtml -A c -r Doc/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Demos/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/cython/cython-0.14.1.ebuild b/dev-python/cython/cython-0.14.1.ebuild
deleted file mode 100644
index a231bd7ee7dd..000000000000
--- a/dev-python/cython/cython-0.14.1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.14.1.ebuild,v 1.8 2012/02/20 10:04:45 patrick Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="The Cython compiler for writing C extensions for the Python language"
-HOMEPAGE="http://www.cython.org/ http://pypi.python.org/pypi/Cython"
-SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples"
-
-DEPEND=""
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="README.txt ToDo.txt USAGE.txt"
-PYTHON_MODNAME="Cython cython.py pyximport"
-
-src_test() {
-	testing() {
-		"$(PYTHON)" runtests.py -vv --work-dir tests-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-
-	if use doc; then
-		# "-A c" is for ignoring of "Doc/primes.c".
-		dohtml -A c -r Doc/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Demos/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/cython/cython-0.15.1-r1.ebuild b/dev-python/cython/cython-0.15.1-r1.ebuild
deleted file mode 100644
index 1481c32aa83b..000000000000
--- a/dev-python/cython/cython-0.15.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.15.1-r1.ebuild,v 1.1 2012/03/31 19:13:10 floppym Exp $
-
-EAPI="3"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="*-jython 2.7-pypy-*"
-
-inherit distutils eutils
-
-MY_PN="Cython"
-MY_P="${MY_PN}-${PV/_/}"
-
-DESCRIPTION="Compiler for writing C extensions for the Python language"
-HOMEPAGE="http://www.cython.org/ http://pypi.python.org/pypi/Cython"
-SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
-IUSE="doc examples numpy"
-
-DEPEND="numpy? ( >=dev-python/numpy-1.6.1-r1 )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV%_*}"
-
-PYTHON_CFLAGS=("2.* + -fno-strict-aliasing")
-
-DOCS="README.txt ToDo.txt USAGE.txt"
-PYTHON_MODNAME="Cython cython.py pyximport"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PV}-test.patch
-}
-
-src_test() {
-	testing() {
-		"$(PYTHON)" runtests.py -vv --work-dir tests-${PYTHON_ABI}
-	}
-	python_execute_function testing
-}
-
-src_install() {
-	distutils_src_install
-	python_generate_wrapper_scripts -E -f -q "${ED}usr/bin/cython"
-
-	if use doc; then
-		# "-A c" is for ignoring of "Doc/primes.c".
-		dohtml -A c -r Doc/* || die "Installation of documentation failed"
-	fi
-
-	if use examples; then
-		insinto /usr/share/doc/${PF}/examples
-		doins -r Demos/* || die "Installation of examples failed"
-	fi
-}
diff --git a/dev-python/cython/cython-0.19.ebuild b/dev-python/cython/cython-0.19.ebuild
new file mode 100644
index 000000000000..8674ad5b54d9
--- /dev/null
+++ b/dev-python/cython/cython-0.19.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/cython/cython-0.19.ebuild,v 1.1 2013/05/23 08:26:53 patrick Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} )
+
+inherit distutils-r1 flag-o-matic
+
+MY_PN="Cython"
+MY_P="${MY_PN}-${PV/_/}"
+
+DESCRIPTION="A Python to C compiler"
+HOMEPAGE="http://www.cython.org/ http://pypi.python.org/pypi/Cython"
+SRC_URI="http://www.cython.org/release/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris"
+IUSE="doc test"
+
+# Note: update numpy dep when it is fixed for py3.3.
+RDEPEND=""
+DEPEND="${RDEPEND}
+	doc? ( dev-python/sphinx )
+	test? (
+		>=dev-python/numpy-1.6.1-r1[$(python_gen_usedep 'python2*' 'python3_[12]' )]
+	)"
+
+S="${WORKDIR}/${MY_PN}-${PV%_*}"
+
+python_compile() {
+	if [[ ${EPYTHON} == python2* ]]; then
+		local CFLAGS CXXFLAGS
+		append-flags -fno-strict-aliasing
+	fi
+
+	# Python gets confused when it is in sys.path before build.
+	local PYTHONPATH
+	export PYTHONPATH
+
+	distutils-r1_python_compile
+}
+
+python_compile_all() {
+	use doc && emake -C docs html
+}
+
+python_test() {
+	"${PYTHON}" runtests.py -vv --work-dir "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	local DOCS=( CHANGES.rst README.txt ToDo.txt USAGE.txt )
+	use doc && local HTML_DOCS=( docs/build/html/. )
+
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/django-pipeline/ChangeLog b/dev-python/django-pipeline/ChangeLog
index 03133f954725..d0465cc01cc9 100644
--- a/dev-python/django-pipeline/ChangeLog
+++ b/dev-python/django-pipeline/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/django-pipeline
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/ChangeLog,v 1.11 2013/05/20 16:43:13 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/ChangeLog,v 1.13 2013/05/22 16:23:08 idella4 Exp $
+
+*django-pipeline-1.3.9-r1 (22 May 2013)
+
+  22 May 2013; Ian Delaney 
+  +django-pipeline-1.3.9-r1.ebuild, +django-pipeline-1.3.9-r1ebuild,
+  django-pipeline-1.3.9.ebuild:
+  Re-add IUSE test wrongly removed from -1.3.9, revbump, added rdep new package
+  jsmin picked up & reported by kensington
+
+  22 May 2013; Ian Delaney  django-pipeline-1.3.9.ebuild:
+  drop IUSE test, futures -> rdep
 
   20 May 2013; Ian Delaney  django-pipeline-1.3.9.ebuild:
   proper fix to test phase
diff --git a/dev-python/django-pipeline/Manifest b/dev-python/django-pipeline/Manifest
index b70a4bde3428..1f564ad7982e 100644
--- a/dev-python/django-pipeline/Manifest
+++ b/dev-python/django-pipeline/Manifest
@@ -8,13 +8,13 @@ DIST django-pipeline-1.3.9.tar.gz 23990 SHA256 b859d0c3cb729b9980c6c91fb509b0ff1
 EBUILD django-pipeline-1.2.24.ebuild 981 SHA256 3ed25489c8b25061f4b19ae871588535344a728281a53a8707657e6e6e786f30 SHA512 0fca9a730536ffe494fd3465b774a3a39fd082f4c6c7c04dbf6cd70004dc38e3476000e3dda580c44909a6e5a9d332e570214b4a558e6244ce9fd00fe99e1a27 WHIRLPOOL 46b44d4c8d7f7b4003d5e0437fdf7e67892ae10b6fe702ddd234e1fbc5bd57bf720ba622f41f905163e23dea35c9434735eccc084451334d3c74e714f6e0aa6a
 EBUILD django-pipeline-1.2.6.ebuild 1543 SHA256 fc56d6136d3946d8e5e5278a141c04bb5a91935e920a4e2c5cade3e749ba3708 SHA512 a17b819768fc89591f702447d1bb3ac71ba20111a5df63fcaa04e7da98e0cf9ba0f6a105d2ab40caadc5ea86f553dcb9376b0ca1b575f9b40393d841c257cf73 WHIRLPOOL 20f0fd31daed355b990d64999ee821734aa30c7968e85ca4905791737c666be5b721799ad103b4b9d37c29ce7fdda4182d9905273132587bce70b498d56fb14d
 EBUILD django-pipeline-1.2.9.ebuild 1566 SHA256 d35b093f5ed3fdafb7956a842a8520a8aac67735231709db0a6bd82bae38b25b SHA512 8a1df64afb185750b861ce2480a2f2429bcdd43f032dcb8c65c5d2cbde9ceef20b9db8a57b209bb0146f751e0697aa4e879680ba780a4d6fef07bd025aefcf2d WHIRLPOOL 9f9eef4ddbd8b35d0da444e095a170ab19c48efdc961aaa2400d77adb215d7904fbed1899c6a44f58f832d36a028244ca18d88324c750609fdaad2c827773165
-EBUILD django-pipeline-1.3.9.ebuild 1614 SHA256 d9e3a558dcfb4f909d3589ef0ca185a3a15a63095b1ff4ed724ca618c7163ee6 SHA512 7ff8b2e5259b3bed7245133373d891eb7226d144341f1bacdb552462310a740debd3883c123d0617c6843e607dc02d7c6a7b4974c16c21324b63d708613cceae WHIRLPOOL e23d4a5bf10d1b35336e979b6c7967938f4dfd8c50854dd4efefbd55c4a5c90c8019701fe463577b6095ea2bad4142a9a43eb31b8f5e426e9f0104342dbc39f2
-MISC ChangeLog 1745 SHA256 54916325bb52869725ce3e593460fc941caca8233f36e6827841ff3bb7b443b2 SHA512 22f03e3c556bacf17567a28d7c3456691e0028cd0f3992bd8d135f6b04ccac372066c0e6fc465b6c31643181a1294e0c14b7e0060e2dcc427385043e2bdc1f85 WHIRLPOOL 6c4c69d9f656bbac2bb9cf4f7857af0083cad204abc541089797448572b5f210057e987183a6adb766377306d58459838d66e873f784d08f981491ee174ce00b
+EBUILD django-pipeline-1.3.9.ebuild 1640 SHA256 c79cecdb882fea148f0dca2fe16fceab3ac0f491e2dd66af1af2c4aac8524e90 SHA512 11c86760a0f4beff1047ba84f843a70b8db2152548778074ddaac87d7c85a5b8e3aaded5a82d194e29f58f7fe31e07323f369222d2f66e4fb313a410056c3cab WHIRLPOOL 3b65f407419ea2d3adf9aea9506166f429cc2170b7665932c40d7a4410b752d2cc4e5ceddab67417adc2af64cce4b0f2bca4b00d69f78c9f076ff7b379d1971d
+MISC ChangeLog 2172 SHA256 a24d69943bd6513de09a5a83592fac3f28ec8744a813e573aab598d61c1de904 SHA512 992ff6a7666fb1abd001174697a9e61354aca5ebb74b00e15d81848a83dc103387e9431db4ad6dbad92b15c07ca3340fece618b6170b6ab850fa7d0b5f6e4cb2 WHIRLPOOL 2f6c30a77d745c9aa118964852c91eee73a6a0be621d3082b371d0551fac5ff837a9610ecd752a6e25a43b36b19a573914fb557d420a3084bb05d9fb103bc7f7
 MISC metadata.xml 253 SHA256 e46efd590a64061ef839b703b4ea6f25ec8aa4b2e4da401c7ae00c74828de0c2 SHA512 8b47855847429a6f134541fe072f4b650f58e8ef0eb534e61c88442681429185b6ae3217512c69a427cf1309bad72fa7ab0d17bc62db76e4653081639224eac4 WHIRLPOOL 28eed9c27b29956e68cc70e1f74106f7e1b30a744c0cf045957cf80b5da93c05174f9a426ea7efef83ed07b7b3bdeb1c7139199e211837c5d4ec64870e0e7c69
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGaUrsACgkQso7CE7gHKw0mFACfRHaEtCw6RIbNOigbiYf7oy5f
-qMcAn1op9+ku4hfmnnYZMqZulLbuwfCS
-=6Ns8
+iEYEAREIAAYFAlGc8PkACgkQso7CE7gHKw0pgACgxLpLs/hZbKo1qybWr89N5i/n
+gZQAoIxIO3MMuhyQnLnMNHazTZl6gN0I
+=lCNu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild b/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
index db6f55b4c140..4a3c6eb238e1 100644
--- a/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
+++ b/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild,v 1.2 2013/05/20 16:43:13 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/django-pipeline/django-pipeline-1.3.9.ebuild,v 1.4 2013/05/22 16:23:08 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -16,10 +16,11 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="doc test"
 
-RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]"
+RDEPEND=">=dev-python/django-1.4.1[${PYTHON_USEDEP}]
+	dev-python/futures[$(python_gen_usedep python{2_6,2_7})]
+	dev-python/jsmin[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	test? ( dev-python/futures[$(python_gen_usedep python{2_6,2_7})] )"
+	dev-python/setuptools[${PYTHON_USEDEP}]"
 
 python_compile_all() {
 	use doc && emake -C docs html
diff --git a/dev-python/flask/ChangeLog b/dev-python/flask/ChangeLog
index cac9f19120d6..92164b172826 100644
--- a/dev-python/flask/ChangeLog
+++ b/dev-python/flask/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/flask
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.17 2013/03/28 03:18:19 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/ChangeLog,v 1.19 2013/05/23 00:34:50 floppym Exp $
+
+  23 May 2013; Mike Gilbert  flask-9999.ebuild:
+  Update live ebuild.
+
+*flask-0.9-r2 (23 May 2013)
+
+  23 May 2013; Mike Gilbert  +flask-0.9-r2.ebuild:
+  Split the dev-python/jinja dependency in two to allow different slots to
+  satisfy it.
 
 *flask-0.9-r1 (28 Mar 2013)
 
diff --git a/dev-python/flask/Manifest b/dev-python/flask/Manifest
index 64061ecb8b97..7d7b937005ee 100644
--- a/dev-python/flask/Manifest
+++ b/dev-python/flask/Manifest
@@ -9,14 +9,15 @@ EBUILD flask-0.6.1.ebuild 1486 SHA256 632487d635a2c16d616061b1f87d2cf8c8534ea185
 EBUILD flask-0.7.2.ebuild 1493 SHA256 b5213a54051d4305e9e27b2c859a9b583628c815c9cc1bf4ed1f8b4cd4804f14 SHA512 afef2143f255c84cb74be324ef53810e68a265971c6bf8230724f6cbeff9d0d0af89ebf80b67e4c0861d9bfa959f90cc4e83895600ef3dc1a05bca3c6002d0b5 WHIRLPOOL 141db7a2796d54a7a2ee1e211d5e1ba6781f1b8ef6ca4a2f38600cbc35def34be40bb0bb0283546fc43d1fcecf037d6439940bfcb1635ed1636225669dc1c1f4
 EBUILD flask-0.8.ebuild 1787 SHA256 35a8907c25abb51f16963f443898c049f8e712eff28f2ae5281265e2b6c19321 SHA512 48ca7b3e34fccf0902a9401cda37c4b967fd4b79a19821ec3f73ff8f5f1b1dc258c155c0dabb5beaec4eaa03931cc8dde014d8f96a092ac55538d1bd195f6519 WHIRLPOOL 4a8fb4dff913c9eca55a990f55b3d70c9ed1683df9544694b29578fd34357ca357e27ab61cfa34e0fb7391081db10b0a297776796537eba29b5079b28292499a
 EBUILD flask-0.9-r1.ebuild 1047 SHA256 59195a8057c0a977d17f1568e5f457f8c1aae4466e40134d870c36579e7c447a SHA512 75940f6bccc44f9f49266f4564932473f4c03d7ec1d3470517183b65f06cdd18f95af47d42ca25f3c3dfc1de82492c000e1f0e727c39136cc94b7cdc09585b51 WHIRLPOOL 799cf7b3ef2fac34ff56c7a7c5eb4df8ad848b313a726b7f48fd1b6e26f56a77afc0732aa63d70ffae21a25a4e1f68ad3bdbc2876b478c75286a485cced59eeb
+EBUILD flask-0.9-r2.ebuild 1131 SHA256 a01330b0613786df2fc30953250fef5c587392c6670baf9d4a660f84f03a19c0 SHA512 68729164ff549b3adf9bca7d108042f17ff6c9939193545f5edc31b0aa73cab474efdf3d1afe4a9bcb2ac2e69ff49c72eb264ddade76d3d761e26f127e54091d WHIRLPOOL 4061879061e8a75cd27b5ca3bffee31a085fe4f849e980327c8e0838078b9efb1340aa3023aa3dca015614f53a0b7e0c01174c4a6423e0334b01a37e09a4e356
 EBUILD flask-0.9.ebuild 1101 SHA256 6b993f064332d51d3783abdd3658941853a055311b9719f1039d4e884b712992 SHA512 dbf3386f63f0195e56c9628d3838ee47d31acfc40a5cebb06e9455d858390cde63988f057ad0cc54dc65c68a5f025ad02a63b0dce362d3b21910dfe340499a34 WHIRLPOOL a82517b7f7c78c5a3d2dec9a2b732d66f266fd0182c4a303a7901f7e045790a753894de6e0652e4e4456d8497722b5b4540c2c512bcd9ecab465055323594568
-EBUILD flask-9999.ebuild 1203 SHA256 28114e6efcd574fe37abcf5029edf520d351edb00fbd4b052be4856101dbaa27 SHA512 f53de1276beb8f4cd1c6d909ed6a5576d8521fdaaa740eae01269c7a8b5e425facf3c38c64300adf18cebff8a1fbf5717832a2e03bc49e8a5cb37bc229739109 WHIRLPOOL b6968e73ca886177c4b29a0aad328ed23a9773ab985aff27d7fbfe5607411f93583d4db4353e073e4dfdcbcfaaf1b238defc1975dc7a035c07b0325618666eac
-MISC ChangeLog 2338 SHA256 3fcc2f53bc702fadb08f052ee3bcf03538fa5a3e8b31eede8be9d561c90927ef SHA512 e9fa2a8151ee90649fc733fe2a6e33b7f2d69a1186c4ea6e307e09f0ddf691ac3754905f7a9069754cf6e50783e44f7b1a3bdec970c6600ddd046e2093d05dd0 WHIRLPOOL e05fd3ef5c364c3ca80dc868cf660348303c4ca6d6e2215dd9cebcd9cfc04d6e1fd6295063aede807ee9cbd2b1351bdbbb0e11562d2ac946655a1e1a66b209ae
+EBUILD flask-9999.ebuild 1287 SHA256 63d75662cd72d1b31292aab06960f518d799fe993e628030a3e3d634363b612c SHA512 12c8831248e15980b9ebe804ab01daee267a988fee40bbae44dfb3c1a51a58d45bf38e27b1b7a326c6d97754dcdb829ccee14f88371bdae25c1f38fb045bda67 WHIRLPOOL 767cb8c87e0286e78d3cbe2f01caeb84515c9909e3f16110c4ea2abba7fca10bd3c0fc43c2f46d3fd083fc66e64a8468997db5a8c0ee1b209359a990ec06b538
+MISC ChangeLog 2619 SHA256 b5982c8bb79e4f9338568deabed6a6c3fe33fa199e1e97f95523b0ec2eb78d57 SHA512 c1366dab88245f4207d06b403cf4ef08362e1e15578db46a7c3dd009ad8872f3892759a8e189ee8fbe037716ab4dd9ca0ba550d4f87c28ab5478661027d896c5 WHIRLPOOL 4f3014494284087e676b70b5c73de71e1cd608d619af6ce7acc76b2af0b55feae004aa681439b07044af66b55ed81d485acf918377748e5914b5bdb2369e2a25
 MISC metadata.xml 228 SHA256 fb512dea8a54907a0d04e012d7a0b47a7f884600d1e1fcbd5094a17dde3f3cfe SHA512 147993a63e6528ff1250a76caf4b923d2307ee987eb38bb5cc9d61465c4d6156e65aa37e12377f56d70d8214a8a919fcb4cf9d461804c29d8b231072a179bc49 WHIRLPOOL eac02505f094986ae26315962fa10eee56249e432f5de219de3fd06d601eb0cadf8bb0b55fdd8055340f39a168791dcd8d3817074fa309adfb75e2841f6eaeda
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFTtnwACgkQC77qH+pIQ6TNLAD/Sp/ScbX/aGsYkRjxXr2vXD8C
-Cgo5X8ljOibCjedRsocBALrtG9rDeEqoY+PdvqdacNS/Z97dXRCBhFOUjuk9VVhN
-=aiW2
+iF4EAREIAAYFAlGdZCsACgkQC77qH+pIQ6T3vQD/ep9SmE6FPzFPLx6p8u2i4G7X
+bfmcBadj1ytZSDMJ5pgA/0o5OHBOSa9UQ6aILJ98o/9SYDy/MeyC2pmb9vhDvzDO
+=nYyu
 -----END PGP SIGNATURE-----
diff --git a/dev-python/flask/flask-0.9-r2.ebuild b/dev-python/flask/flask-0.9-r2.ebuild
new file mode 100644
index 000000000000..d0c874374aad
--- /dev/null
+++ b/dev-python/flask/flask-0.9-r2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-0.9-r2.ebuild,v 1.1 2013/05/23 00:32:56 floppym Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="A microframework based on Werkzeug, Jinja2 and good intentions"
+MY_PN="Flask"
+MY_P="${MY_PN}-${PV}"
+SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
+HOMEPAGE="http://pypi.python.org/pypi/Flask"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples test"
+
+RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[$(python_gen_usedep python2_5)]
+	>=dev-python/jinja-2.4[$(python_gen_usedep python{2_6,2_7} 'pypy*')]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/werkzeug-0.6.1[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+python_test() {
+	"${PYTHON}" run-tests.py || die "Testing failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-python/flask/flask-9999.ebuild b/dev-python/flask/flask-9999.ebuild
index 2729f5f64761..8cdbcc7a0680 100644
--- a/dev-python/flask/flask-9999.ebuild
+++ b/dev-python/flask/flask-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/dev-python/flask/flask-9999.ebuild,v 1.3 2013/03/28 03:18:18 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/flask/flask-9999.ebuild,v 1.4 2013/05/23 00:34:50 floppym Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy{1_9,2_0} )
@@ -24,7 +24,8 @@ KEYWORDS="~amd64 ~x86"
 IUSE="examples test"
 
 RDEPEND="dev-python/blinker[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.4[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.4[$(python_gen_usedep python2_5)]
+	>=dev-python/jinja-2.4[$(python_gen_usedep python{2_6,2_7} 'pypy*')]
 	dev-python/setuptools[${PYTHON_USEDEP}]
 	>=dev-python/werkzeug-0.6.1[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}"
diff --git a/dev-python/html5lib/ChangeLog b/dev-python/html5lib/ChangeLog
index 6b9102023e9f..423d08eee2af 100644
--- a/dev-python/html5lib/ChangeLog
+++ b/dev-python/html5lib/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/html5lib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/ChangeLog,v 1.14 2013/04/24 08:27:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/ChangeLog,v 1.15 2013/05/22 16:19:08 jer Exp $
+
+  22 May 2013; Jeroen Roovers  html5lib-0.95-r1.ebuild:
+  Marked ~hppa (bug #471002).
 
   24 Apr 2013; Agostino Sarubbo  html5lib-0.95-r1.ebuild:
   Add ~ppc, wrt bug #461346
diff --git a/dev-python/html5lib/Manifest b/dev-python/html5lib/Manifest
index c941b4234584..a9f668c95476 100644
--- a/dev-python/html5lib/Manifest
+++ b/dev-python/html5lib/Manifest
@@ -1,27 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 DIST html5lib-0.90.zip 99322 SHA256 765e04a2c8a08db9209a46887e5244200bed0068f74fdd87fdc219a0c3a1401f SHA512 eb882a55d116d26760956f03214e79c533efa887db5d098cae09a3a40fa870414a6cd2e5a14a6d1bacb9fbc1dc0668e1f9ca99e54ab4ce539f89a68b38883437 WHIRLPOOL e658ba01e67506f6252a365b1cfdabae034cb77c1eb6952c1256d4aedab0ab9ac590e5eee98f6c988af0cd9dbb9c9b5556832f6622fc181fab5baa94c8de83a1
 DIST html5lib-0.95.tar.gz 222614 SHA256 a6e707d9cb17c8bf1e553713ad14b31274a81d5c0ce0fce21b02936d0efd7dbb SHA512 95c8221fb265b0a931636658170fc0c8a95b16c48576d5aa85ea3c6b088e6039f3f8d66cec67e0e497a63394bbf178b0251c0b9897ea9d1c2d5ae90ca35da464 WHIRLPOOL 355aedaea043231b7c473b2b6fb0455c57a8bedb315a83aeadede9298a484ca4a34584901d5bef4ff2320bef894d562559965350fdec5c5fdad75b63e6abc8a6
 EBUILD html5lib-0.90.ebuild 884 SHA256 82f2e3a97efdeb6e72ee6ce0e5c39fe74440ff94c63dbd2e578cef6327be3f3d SHA512 1cac156bbd054b982254a40c65311d2967cb05d9f7d95719eb0e53b13cf58dc3fc0528b866da87a15b52ed1da037d6d65a92a23f217a1fbf525bc1abd329096e WHIRLPOOL e9a70ee09f8845a5065c4996804fff1e8880fbf533711e87485f9214f6f05740c632da2135d2d82734fa2447a5231cd0df4af2a1cbfac7760b5b5f2ff377f5a6
-EBUILD html5lib-0.95-r1.ebuild 1014 SHA256 67b0147c6fd3584c5a4fd10d5c6b932b9089f215374ecfd52bd070fa377f9af3 SHA512 99e0d7a054301342ddcefd43f91b93cacec92bb8eb045172ecdc7e226376ae1c50786b7ecce50139dfcc3a7075f9c5717d32adfe271d7d8fe5de074cb884c85a WHIRLPOOL bd99886d8df5870723749172b7cbdd04ebcd281bd810886d2853795357b30b9b1ea41e99da29e63d4553449912678bafea40ab287c70c8c6b17d37472759349d
+EBUILD html5lib-0.95-r1.ebuild 1020 SHA256 c2e80d5dec83a2c3357efda52bbf75425e29b91905e60602760b36cdad1e2efc SHA512 a5476144d24024ec79425cee36c7e50d9a25d901c8ea2392aa1b977eb8f8d76ef4d6df250642ff05b72d87d008c21d7264caa705f4a1260c474c6385cd0aa2b3 WHIRLPOOL 52c4bec15790949a27fd365781047092f1308e129e2a58a38a304e005da4cfe819cbddd796668917f4df087df187ffe8a03505c16112c2880acb1bac2475d889
 EBUILD html5lib-0.95.ebuild 656 SHA256 7d55b1d84978b5be2aa0921f5ef21dc95280c9d9bc38ff56c52d06e3007f8e92 SHA512 b3bc972cc01d0faafcb201d3595f0780081596aeeab55aed588dae236186f0921ef63d4d907f96031dbde6d296df2239731902ac29c597be5ad44fb7a6e04c78 WHIRLPOOL eca3df12f53681cde3770917298150f5ff93697a5ecc69803fd95e2599722c7dc5bb892c1921a40ead2303a240f3e904d11721a1cda709e05a6cb44ffd3dc47f
-MISC ChangeLog 2396 SHA256 6e652dbbbd9549409b529a7dc28a6be151645c3c33469501df4111a23b79f67e SHA512 f909ddd8fa13316691f9a35a703cfed0d7c9fc90d005e3ffbf5e016e9c7907af38a599902805da1ca94282b899185d8216b4cd5fd2b3a1092103201f08c76ef1 WHIRLPOOL e62d59133568f2e2a1fdfb3e39b4d300f817cf4655d7ef1c9f3ce6dba291dc10b84b7e1fe3e7ebed793203822c3b9d887fc160c7764109b1af51b3e5e287ca84
+MISC ChangeLog 2499 SHA256 22a5bac817179cd692bf56d194f3fda8cb81323be639ebfc433a4d6fb9474e7d SHA512 4f34a956b31751fce4d41714d2a3a4026de623d81c5b15a7247ce1077f407ba447f433f5b7164aef3e09f6babd775c892499cc074040565977b642ae04a48cbf WHIRLPOOL 8dfc7d978f3a4e5185f67c0ac7a612b8637a168ea94e7a018b67261f43f93d43eeaf7d9179925c65f7b518a5d977baabea6b45b7a006f779e2acec66ab083437
 MISC metadata.xml 238 SHA256 5ac01bb390c132fc90c93c84a7a8c9d43bb9955eb78a7989bb160cd25f7a4a5d SHA512 5a1cf952cb3e44b4104658d9207ccd827cc33011d840cc062da600255f942162ced8740842bb179185e599daefc24f335e049c50d90379783ad42ed9f3309fe8 WHIRLPOOL d16ef4c38de6db22ed27dbbf430ab12fa7b8867ac803dd4d8958975a7bae1e494ba29affe1fbb77fbb641f1cb6d762974271c817b11e75ea52229153d801d66c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRd5bxAAoJELp701BxlEWf5X8P/RNtHueY+z7ajK/fDgxZK36W
-acrGSFN6i5NzVCK4zLLsXZjfiOCREdKz1neuW2ry9kuBnUWoP3KpCeEvO/bWQhb5
-P9STWs3GHHhd5iLDBSxi3MjCnQ1fNYrPEIE4VcfQ9VLYJU26N/tQd2peq2qnS30m
-iEpk16vI96FM++pJ2RVcg2gEnQ8UFFR6o2jmlwxYnq6ppM7d0j19c3IqYO8e3IGN
-LuqFBf3x23k5PsBLy1ELRDY3EJJCrRmEaxjO2T84zKE1fLAZYaOH6eONn1PV6K3q
-29p3f6JVVfWwoQghLTRKWVVchsTrzbLtNpWuhHxIXNsZGcAKZXdq2LIJFjHlfR0u
-jDoy+tbQbHJGSajZc/XEZa9U7cIp1q6DYQ+9w8pHcAkaUUP6zCelHfbXA7jefEYu
-wz0XlWfPHOcZEF+e5kyyM8wXDW17LQb83h9hc9CHAyzjgSyNPjrtmNGELiIGGxNG
-0Y/rDA6shZTFr3QRZillv5IHp2b87kaWd0hoj/NayjdMAE889u3TLH4An7B3KVjE
-FJROVFElI7h952b8/IxoRXVvTY9ivO+RwRiL8VBAneHCFPp4zqUzjXraJpVctozx
-mXkTZwmUAjpn7CAC7nLW0Hf0jGHCaEnyX5hefju5evEjMHyWEC0sdPs3rO9R69lJ
-7xJtkeh1ImLN5fcLT4+B
-=TtJX
+iEYEAREIAAYFAlGc8AEACgkQVWmRsqeSphNQagCcCx80Vc2y3zSc8F01oXVUWL+C
+3ewAn1nloAVGvIz0F31+WaM0Z8oGVpLc
+=rNar
 -----END PGP SIGNATURE-----
diff --git a/dev-python/html5lib/html5lib-0.95-r1.ebuild b/dev-python/html5lib/html5lib-0.95-r1.ebuild
index 167e75903f45..9dd332fda894 100644
--- a/dev-python/html5lib/html5lib-0.95-r1.ebuild
+++ b/dev-python/html5lib/html5lib-0.95-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.95-r1.ebuild,v 1.3 2013/04/24 08:27:57 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/html5lib/html5lib-0.95-r1.ebuild,v 1.4 2013/05/22 16:19:08 jer Exp $
 
 EAPI=5
 
@@ -15,7 +15,7 @@ SRC_URI="http://${PN}.googlecode.com/files/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86 ~x86-fbsd"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd"
 IUSE="test"
 
 # unittest2 used by our python_test()
diff --git a/dev-python/jinja/ChangeLog b/dev-python/jinja/ChangeLog
index b9db75fd0c95..c98c4211ccc6 100644
--- a/dev-python/jinja/ChangeLog
+++ b/dev-python/jinja/ChangeLog
@@ -1,6 +1,32 @@
 # ChangeLog for dev-python/jinja
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.65 2013/05/20 14:51:15 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/ChangeLog,v 1.72 2013/05/23 13:26:43 floppym Exp $
+
+  23 May 2013; Mike Gilbert  jinja-2.7.ebuild:
+  Only build docs if USE=doc is set.
+
+  23 May 2013; Mike Gilbert  +files/jinja-2.7-docs.patch,
+  jinja-2.7.ebuild:
+  Fix error building docs, bug 470856.
+
+  23 May 2013; Mike Gilbert  jinja-2.7.ebuild:
+  Simplify docs build.
+
+  23 May 2013; Mike Gilbert 
+  files/jinja-2.6-python3.3.patch, jinja-2.6-r2.ebuild:
+  Cleanup python3.3 patch based on feedback from Arfrever.
+
+  23 May 2013; Mike Gilbert  jinja-2.6-r100.ebuild:
+  Don't apply python3.3 patch.
+
+  23 May 2013; Mike Gilbert  jinja-2.6-r100.ebuild:
+  Don't install the vim syntax files in the compat ebuild.
+
+*jinja-2.6-r100 (23 May 2013)
+
+  23 May 2013; Mike Gilbert  +jinja-2.6-r100.ebuild:
+  Create 'compat' slot for packages requiring python 2.5, 3.1, or 3.2, which
+  >=jinja-2.7 does not support.
 
 *jinja-2.7 (20 May 2013)
 
diff --git a/dev-python/jinja/Manifest b/dev-python/jinja/Manifest
index a9da1c8b4f29..c94d29fe602b 100644
--- a/dev-python/jinja/Manifest
+++ b/dev-python/jinja/Manifest
@@ -1,19 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX jinja-2.6-python3.3.patch 2923 SHA256 ea056a4d046fb61e6f6de5a1e15d96cc64e00257e128535e68878ff265b8293a SHA512 27a5dade64e555eaefe30512a5cf3ff09bbafc83ea05d051a9a1835a7122988c5d6e93a44d50a0c4d9eaf5eb339d6dc5cf97b239f2b521b83f6609be1257f63c WHIRLPOOL df8d052bbfc24636ee2969e5dbc8e7724f2ff8c2460a003a5dd2cab188f48a3d3631ce65c357891ff2f010f81dd683c7803fd3751797e240d3da28b8c990a5ed
+AUX jinja-2.6-python3.3.patch 591 SHA256 38a97d3ffc527d9d12dcb6e103b8a214b95d8d554995f095532915e514ef5251 SHA512 430dcb663bc623c639d1863a7e0c0fd8687f601b570ea4df4fd6ddfe1a7e03c63a90bd30fb53c1ecb11fd57fdc92eb451d243be1d46c5135516d992c102a5011 WHIRLPOOL ab2d5e4fd1d769a0019296e65fff5b3323ed47067aaca9e1a6f59e3fd430bb91aa8517e46fdf7ea4e51b973cb35311d3f673b2e9dc7f948d8e8adbe40a8e8336
+AUX jinja-2.7-docs.patch 1945 SHA256 d3299aff0ed48f0b89a7ad07ba092b02696fb85692d30ec569d308e0925744f7 SHA512 5cfb134597eb3d39426a6e79d871d7381d776e9709b3a9f606c2d5772eacfb508105637e95fcab88fbf2705f3997d9d0f92bc85f92c790603c95ca1f096d013a WHIRLPOOL a27f652d0fea41df7e8b079950a1b7c928386dab954e5dab423906a4f97206573b72280c9073cacfd80f90c6ef112c9f1ffabeb45965f187daf4e288040f5eb7
 DIST Jinja2-2.6.tar.gz 389741 SHA256 a85e185375db75c109f99ecde3d55415f035e7068a82252cf4f16c667ac38f49 SHA512 6603bd6a7e4956433746da15b18b1206b67c901262337aab8352ddff154efca9eb6d652c244c63e8ffad492d204c724db3e86222ae371e75e3f5f2011244554e WHIRLPOOL d6d27867a6d4d9f82e956d5d116faae4adfb5f1fea4ecc067fec61d67eca0d16ee6dc80d8585f34a49a89a2da18c65395a4d615b5723241866ff27e3362f915f
 DIST Jinja2-2.7.tar.gz 377603 SHA256 474f1518d189ae7e318b139fecc1d30b943f124448cfa0f09582ca23e069fa4d SHA512 44d0c18babcdb84160eeea077ec6dbd63bc4669ee81b0f5849bc42a9d9665b3e6647ce64ea2e15f04940807a67f25ebcf937da217318dea3d3dc1531800422b1 WHIRLPOOL 7978e27b8b97b832ef0ba910569678c8a931593a8fae16b247b8d8e7516f08b80e4086beca00e6890c9a4dd193d3fb87c49dd40ec9e738dbb4b018df6e762b8f
 EBUILD jinja-2.6-r1.ebuild 1834 SHA256 6cc0b89c803fb4733a40953667dce8cec445963dc46dd813f4bce341a475d9bd SHA512 dc21f64353a3615fb866a4d9e40223b5f85d492def513a310a8e63e7699b67d06c66db0ffe52b40e8d602d9b4f71fa704e37cfd995b2b2b7601e9f3c737f0e14 WHIRLPOOL 37b95f984eaa5254278cb48073233e31caa14ed6a501b8e83e1df016df1e7e441db529b16d8f829e39e65938364d37180c896e30167582c38f0a5b812df81eca
-EBUILD jinja-2.6-r2.ebuild 1913 SHA256 f849c6169b0addc9f80088a25be63210547524b9757c3c8f4c4a3ef55976f127 SHA512 0faaf37cafbbed355ec8fac75268cf2d1ee4231b44fb3f94ec5522431a06001adc11405657e853682c16a2b8c69db6eb23df2c70c8b3bc8ead36c3d2ff0f2d45 WHIRLPOOL e7c0d426fbe9c48804a0d567add1986f6d69e2e6cc008bd3be96ad7a6aa79d2a328a976576ed0d77e4065be43a00601ef454086e8fdfea90d6c724f93b8b022b
+EBUILD jinja-2.6-r100.ebuild 1796 SHA256 c674d63babbf53700b1739dbcf41440bda5f1bb3071d89aecebcbf236673bfd0 SHA512 9a7996df2db53d06f91d5c5909c514f2abff041b202c3e151cf33e28a8f4c10573dfe9ebab73c9a7391a1dc31a0ec717df91b9a870824d7e91194f9a8bf12524 WHIRLPOOL c1891127e75ec5cbedfa6d657a78d922578ed119fcb7a92fc7104fb59aec256911e00324affc53bf9d60ed7e50608014bf43f61e820ca03b99e606b814c7c916
+EBUILD jinja-2.6-r2.ebuild 1894 SHA256 30e423e8d4cc103957d74be2fd21f544cffcf1b8a647ec0d7dfd50d54193d9d2 SHA512 b6ece75eee1b9f6424e8a53bbcd42d03c64252e540d6a5275283d8dc59941b6f53e09d4250f558d0329a252a1c28a15c71eb7e9f0eed8e09a622a2d7de3091ff WHIRLPOOL 58360533f339b58fc91790dbbf7bc412dbab38a001039bed2c2dc9e0f994e2e9dcdbd750f330c9bab0c0394313edcc681921230e52c175b03360a1fd37386eab
 EBUILD jinja-2.6.ebuild 1885 SHA256 ca7229d425db7195fdb936ce819b014664de41a9847face956612288e0e6a9e1 SHA512 88d8513f5132d5877704db80d320b3cf1210b56118d2bca034aa6cb4a5135fdd330cafc3439f357746c721af49d2368c095d6501e63ef14525fab0fc97034e6c WHIRLPOOL f5eb57b60bcc43905da22da49f58aaa6c4f6a23e00322281149d63588ef1d8430bad8b2364b510efa0cee760450d0855464a0a409d8e34b4e2657cb9a49b55c7
-EBUILD jinja-2.7.ebuild 1831 SHA256 9f374116604c45c0923e36e2fcb2ac65fe69882493b4b217523fda39373f67fe SHA512 1da9c0a764c5b64630c90fd38ccb8375b8dce5b1e3783a6fda354f8a00fc902de38af88f3e16108b72a35caaeab173b1b7752ef9124019b6ed48cc6be9362ddc WHIRLPOOL e6dd4ed7150e94e931e122a4b9a28ae62155d74a9a7d79f1abb9ad6e2f6443feee34b142c9a40ddb477ddfa28f32eee964162f62cc88a65c501c45162108211d
-MISC ChangeLog 13006 SHA256 423098e4719baa88a4a3f84ea534fd56aa5e9b854277a5b66e2a8ba14769541d SHA512 173715b7ee0f509248512104844b090c2e5ec089a110a0153ec11e2924bce88eba4ce84b29ba569694d99d36f6771cf719e8cbe1f399883f161c27cb9abc78a9 WHIRLPOOL ad28fada548e309fc388d4c6aad33b1c87b9226de1ad13eb5463b3bc747e1506a1c39f6fd77d85e4989e9936a57e5e84fbc67e91638ef6c6f2dd9d5f6cbf2b4d
+EBUILD jinja-2.7.ebuild 1715 SHA256 45f53cf4ab87fca4cef8d09062424009e3282d620fb936620bf6946737f861d3 SHA512 809a759807d4758a915d602f2c619a695492df60c9fee688095527da4bcd7fce5b0f41fa14242d020a7f6e113e8720c8db5f107ac987136acc16db235b85c940 WHIRLPOOL fb0f0769ef59ca4fd6fb93cc920bab463a2553a52e8b4710d72715b9e2f303e55ca225641eff185b44da79a12025562a6d74a911f225c2d4814938b037a01cb1
+MISC ChangeLog 13959 SHA256 30e13a2657454c679a654bb6cce0c3ff02e507eaa8dcef1b5db380eec2b99643 SHA512 0c50d8a212bfdeb859ba936b5923376b8b30fe6cec41a375f3b2ff3e0b3cd3efb1aeb40fa5a9706ca298504db905f9f1fb4194ac1e8e94a939cc802f4e373673 WHIRLPOOL ca256ccfdfa48b4fc0c6486fce1620aab1a9e4427704a3c5960474c125f751b3b11c35c2309441b921f4651a119ffa22be06c2cebe5eb534704093d5245ae7bf
 MISC metadata.xml 260 SHA256 bda84a3528019ac7c58b2435d70ad4a5f5c5fa29f0f8643569b4710081c2e555 SHA512 ac8108e6022705d5954c6ea7e504f0fb9dfd618c22d126ea6d22d181f6784dbd504ed705dc995cbd6c444067d43f46acb1cda58481b1c5459e4f9df7f260a81b WHIRLPOOL f6d4bb49f06a00d8ecc5d2e28ebdb80dee4dca9a77ce5d1926b45386301a2c267c943c991375ffdcde1473a8e30073803512a9e2f091e318fe6401d039c4c696
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGaOVgACgkQxeMuLWsGW/t8RACfd1nUr61He9l4X43/wqpMqa9g
-DtYAn3yLLSf1ZsZzzglfV/0L3y2GuAmZ
-=pVIr
+iF4EAREIAAYFAlGeGRQACgkQC77qH+pIQ6TCYAEAnGxT+zxoaAobRuAuzdGURBge
+ZfvsiQ3aA1CEZ8Jbh98A+gPz21KMvrlyUojkMDU1UT4H0cbmpRO8pTsCWJ7rG1JT
+=3rZM
 -----END PGP SIGNATURE-----
diff --git a/dev-python/jinja/files/jinja-2.6-python3.3.patch b/dev-python/jinja/files/jinja-2.6-python3.3.patch
index 08155f670cd3..29bd38ead6df 100644
--- a/dev-python/jinja/files/jinja-2.6-python3.3.patch
+++ b/dev-python/jinja/files/jinja-2.6-python3.3.patch
@@ -1,62 +1,3 @@
-diff --git a/docs/jinjaext.py b/docs/jinjaext.py
-index 12b5447..8395a55 100644
---- a/docs/jinjaext.py
-+++ b/docs/jinjaext.py
-@@ -8,6 +8,7 @@
-     :copyright: Copyright 2008 by Armin Ronacher.
-     :license: BSD.
- """
-+import collections
- import os
- import re
- import inspect
-@@ -22,6 +23,7 @@ from pygments.style import Style
- from pygments.token import Keyword, Name, Comment, String, Error, \
-      Number, Operator, Generic
- from jinja2 import Environment, FileSystemLoader
-+from jinja2.utils import next
- 
- 
- def parse_rst(state, content_offset, doc):
-@@ -110,10 +112,10 @@ def dump_functions(mapping):
-     def directive(dirname, arguments, options, content, lineno,
-                       content_offset, block_text, state, state_machine):
-         reverse_mapping = {}
--        for name, func in mapping.iteritems():
-+        for name, func in mapping.items():
-             reverse_mapping.setdefault(func, []).append(name)
-         filters = []
--        for func, names in reverse_mapping.iteritems():
-+        for func, names in reverse_mapping.items():
-             aliases = sorted(names, key=lambda x: len(x))
-             name = aliases.pop()
-             filters.append((name, aliases, func))
-@@ -145,9 +147,9 @@ def jinja_nodes(dirname, arguments, options, content, lineno,
-         doc.append(p + '.. autoclass:: %s(%s)' % (node.__name__, sig), '')
-         if node.abstract:
-             members = []
--            for key, name in node.__dict__.iteritems():
-+            for key, name in node.__dict__.items():
-                 if not key.startswith('_') and \
--                   not hasattr(node.__base__, key) and callable(name):
-+                   not hasattr(node.__base__, key) and isinstance(name, collections.Callable):
-                     members.append(key)
-             if members:
-                 members.sort()
-@@ -169,10 +171,10 @@ def inject_toc(app, doctree, docname):
-     titleiter = iter(doctree.traverse(nodes.title))
-     try:
-         # skip first title, we are not interested in that one
--        titleiter.next()
--        title = titleiter.next()
-+        next(titleiter)
-+        title = next(titleiter)
-         # and check if there is at least another title
--        titleiter.next()
-+        next(titleiter)
-     except StopIteration:
-         return
-     tocnode = nodes.section('')
 diff --git a/jinja2/environment.py b/jinja2/environment.py
 index ebb5454..1b5dc40 100644
 --- a/jinja2/environment.py
diff --git a/dev-python/jinja/files/jinja-2.7-docs.patch b/dev-python/jinja/files/jinja-2.7-docs.patch
new file mode 100644
index 000000000000..d543f54d6cd7
--- /dev/null
+++ b/dev-python/jinja/files/jinja-2.7-docs.patch
@@ -0,0 +1,53 @@
+From da94a8b504d981cb5f877219811d169823a2095e Mon Sep 17 00:00:00 2001
+From: Armin Ronacher 
+Date: Mon, 20 May 2013 14:06:59 +0100
+Subject: [PATCH] Fixed docs not building
+
+---
+ docs/faq.rst       | 2 +-
+ docs/jinjaext.py   | 2 +-
+ docs/templates.rst | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/docs/faq.rst b/docs/faq.rst
+index 4db5079..00a4d0d 100644
+--- a/docs/faq.rst
++++ b/docs/faq.rst
+@@ -157,7 +157,7 @@ Python 2.3 support you either have to use `Jinja 1`_ or other templating
+ engines that still support 2.3.
+ 
+ My Macros are overridden by something
+-------------------------------------
++-------------------------------------
+ 
+ In some situations the Jinja scoping appears arbitrary:
+ 
+diff --git a/docs/jinjaext.py b/docs/jinjaext.py
+index 8395a55..3c217f8 100644
+--- a/docs/jinjaext.py
++++ b/docs/jinjaext.py
+@@ -23,7 +23,7 @@
+ from pygments.token import Keyword, Name, Comment, String, Error, \
+      Number, Operator, Generic
+ from jinja2 import Environment, FileSystemLoader
+-from jinja2.utils import next
++from jinja2._compat import next
+ 
+ 
+ def parse_rst(state, content_offset, doc):
+diff --git a/docs/templates.rst b/docs/templates.rst
+index e0a19fa..4a6a379 100644
+--- a/docs/templates.rst
++++ b/docs/templates.rst
+@@ -579,7 +579,7 @@ Inside of a for-loop block you can access some special variables:
+ | `loop.depth`          | Indicates how deep in deep in a recursive loop    |
+ |                       | the rendering currently is.  Starts at level 1    |
+ +-----------------------+---------------------------------------------------+
+-| `loop.depth0          | Indicates how deep in deep in a recursive loop    |
++| `loop.depth0`         | Indicates how deep in deep in a recursive loop    |
+ |                       | the rendering currently is.  Starts at level 0    |
+ +-----------------------+---------------------------------------------------+
+ 
+-- 
+1.8.1.6
+
diff --git a/dev-python/jinja/jinja-2.6-r100.ebuild b/dev-python/jinja/jinja-2.6-r100.ebuild
new file mode 100644
index 000000000000..d5ed2d4ccd68
--- /dev/null
+++ b/dev-python/jinja/jinja-2.6-r100.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jinja/jinja-2.6-r100.ebuild,v 1.3 2013/05/23 01:17:33 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,3_1,3_2} )
+
+inherit eutils distutils-r1
+
+MY_PN=Jinja2
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="A small but fast and easy to use stand-alone template engine written in pure Python"
+HOMEPAGE="http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="compat"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris"
+IUSE="doc examples"
+
+RDEPEND="dev-python/markupsafe[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	! +jsmin-2.0.3.ebuild,
+  +metadata.xml:
+  New ebuild, rdep to django-pipeline, ebuild written by me
diff --git a/dev-python/jsmin/Manifest b/dev-python/jsmin/Manifest
new file mode 100644
index 000000000000..a4fec4bbe766
--- /dev/null
+++ b/dev-python/jsmin/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST jsmin-2.0.3.tar.gz 5715 SHA256 3e350a84896faecdbd4aaa3a8ffbb3523eb2c94ee1258c8ccbbdb0d9480a6953 SHA512 a448de8f3b6435487e8daa8bd2a5a34406060afde4b4536f4861a029d4bd1d06c15ab8a4e230a82d2e66c9b9b3de9b2225a562d13f7f84888d501ff54fbb840a WHIRLPOOL 9d62a4ad3d853f58c278b8576100cd1c80bcf680a651f00b923eae82638b53362bd53bd2bc9782dc37805b7ca9c7257015a58a016c0ee2506d808f93e0c9963b
+EBUILD jsmin-2.0.3.ebuild 659 SHA256 31a7f9e3c0d6368182820dbb8803921379ad76f198e5fa84ec65ded92946c6b0 SHA512 26e1cb64c87411a04b442bf8b0ff10521d8747600254d6f786d78e3ab9597fcb56a2de8efe19bc613ae56542a500fbbc8cede553b74266207d2b0f013da8b27b WHIRLPOOL 1e05a0034fa139ff027bc1b52250610936e3374675e055b6e900932863f19adee4d747631c73e961b95989eac14873829792ee45812a0f831c3f3301a709411c
+MISC ChangeLog 380 SHA256 2550868258ab24a7b2b19f773228b0743358d8ce759e161b2276ef8978658db7 SHA512 bf537daa1bbed0995cb1f0a5accef14ec75d7d6da1525b15a2d2674fd41356a2cceca7d1074ae3e04fbce28fe82d84a57d5483127c3aa569f950dfa5499b6191 WHIRLPOOL 9feed844f202965d0a6a5f3f1df70a77eb29f17307abb5fd10c73e3ff71b57a1513ee27d8a4d8ed771aabd3d4b2c01664f467890dd0e54ca49ceb7666841316b
+MISC metadata.xml 167 SHA256 a96c7a7081b1a192fc4758c24f63e3f458ce37c90ef5594005e91e01a5daf934 SHA512 05f506754bd3182ba88befefe0609d354f9ee335bea2d866f30719b292ebae30dbe64d6c68ff1a918bfd380bd638146b30754d072229491e8ed6f9d6745510c9 WHIRLPOOL 59ac07478ebcd8bb8b5edba5af0041df85949cf69083c3aae6945e371e6b79c6c92e2bd21189b2d8a87de72c9a4cd299e0773ff73332e247f95b8e850a76d054
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGc67MACgkQso7CE7gHKw3s4ACePyfZv9XNLTDDcBymmFhPnCt+
+E/AAn2iHBO1SpIMRZ5GC9HWiwK+r90YD
+=1OQY
+-----END PGP SIGNATURE-----
diff --git a/dev-python/jsmin/jsmin-2.0.3.ebuild b/dev-python/jsmin/jsmin-2.0.3.ebuild
new file mode 100644
index 000000000000..0ae10231e572
--- /dev/null
+++ b/dev-python/jsmin/jsmin-2.0.3.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/jsmin/jsmin-2.0.3.ebuild,v 1.1 2013/05/22 16:00:38 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="JavaScript minifier"
+HOMEPAGE="https://bitbucket.org/dcs/jsmin/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc"
+LICENSE="MIT"
+SLOT="0"
+
+RDEPEND=""
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+python_test() {
+	pushd "${BUILD_DIR}"/lib > /dev/null
+	"${PYTHON}" -m ${PN}.test || die
+}
diff --git a/dev-python/jsmin/metadata.xml b/dev-python/jsmin/metadata.xml
new file mode 100644
index 000000000000..0645cd9ff8f3
--- /dev/null
+++ b/dev-python/jsmin/metadata.xml
@@ -0,0 +1,5 @@
+
+
+
+        python
+
diff --git a/dev-python/lxml/ChangeLog b/dev-python/lxml/ChangeLog
index c1cced664941..b69a3cd17107 100644
--- a/dev-python/lxml/ChangeLog
+++ b/dev-python/lxml/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for dev-python/lxml
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.158 2013/05/14 22:39:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/ChangeLog,v 1.161 2013/05/22 22:27:57 idella4 Exp $
+
+  22 May 2013; Ian Delaney  lxml-3.2.0.ebuild,
+  lxml-3.2.1.ebuild:
+  Return arches in KEYWORDS to 1 line in -3.2.1
+
+  22 May 2013; Mike Gilbert  lxml-3.2.0.ebuild:
+  Drop pypy support.
+
+  22 May 2013; Ian Delaney  lxml-3.2.0.ebuild,
+  lxml-3.2.1.ebuild:
+  Adjust -3.2.1.ebuild to depend on beautifulsoup-3, beatufulsoup3 added to IUSE
 
 *lxml-3.2.1 (14 May 2013)
 
diff --git a/dev-python/lxml/Manifest b/dev-python/lxml/Manifest
index 0044a20052df..56496e3b293f 100644
--- a/dev-python/lxml/Manifest
+++ b/dev-python/lxml/Manifest
@@ -19,18 +19,14 @@ EBUILD lxml-3.0.1.ebuild 2304 SHA256 a9084b2c8da7a3b3e7160b255f09fd8bb90a35c7a4d
 EBUILD lxml-3.1.0.ebuild 1785 SHA256 d6fcb81dc8921634166dd47e0d41e95b67982f89f11730eea08db540c8ab8c36 SHA512 7f701fe689c4569b7bc6be4cd5e1b4a6517a8e65c01c6b4b0b7b787d7b905dd174903af978955b103ceb82040807ecfa78dcd0b99b3887e39f6c35a2af95a5fb WHIRLPOOL 15dc2cffc6ed6fb7ebe4ebd44f1bd2439cd49eb367b21a9421e63a60b00498e60fdf88ae06949a3eb6fee53a4130b27e9f76f2fd2efb5fafe446ec535ebf2a18
 EBUILD lxml-3.1.1.ebuild 1785 SHA256 bd0c13628e68e1be2929d1e5fd715aee26e25b84dded4ab0a3dd904b9f35d0fb SHA512 23a231cc1e720a9e4eb1a4d13923a048dce98a803de19482644846449d4c059c1138337e19043a0b040b6bbcf7ba1936442df94ce749deacde63403dd594b133 WHIRLPOOL a25848cdaf137faa32e89aebfdc901eaaa47644f34e8715e5bf2c3745a2e6878dd08797c3d39066b101111c1f300b5f888cab2e34b86bc588c63233d18b7e4a9
 EBUILD lxml-3.1.2.ebuild 1785 SHA256 4c8a469e8a7ac92ca65a2b9cfd402c89188b3efb2dfc9ca6c785dfe5f609d273 SHA512 1bc7a46d8bd6463f2e3f95b7b5f3689f786580c3b3db12306c60d8d04570c05431b92a8162708ccaa5abaafd7a712653999c9b8d0f29c0015ab83affc446bb6f WHIRLPOOL af528a01f64f15ca28a6c4852da7e018e942cf0b05b275cc921e74b8f98429205a406058add105355340f02bfc042d648716e71a2a06aca9d2434bc47ea6b9e8
-EBUILD lxml-3.2.0.ebuild 2007 SHA256 39d16714982a9d248f7483c19500c0127d62d090237697003478a71fc9b9d3d6 SHA512 d400570f36efd1019981890ed7d05d6576f995be18866b8500ce4ba9bfc48a1ed62c1e721ec3856461bf4aac4cf173d7a8e11ff0e78c46e8051a71a9ed14c165 WHIRLPOOL eb74687e2ff2fd42b6984c51419e3535df353da1c1f14054e266dfaf5223ac841767ae977e17b40b568f735cf7fb849aa5ebee9707d2a0a276d0020b622dbb63
-EBUILD lxml-3.2.1.ebuild 1954 SHA256 2535ab50141d397eed455473ebe4d0cba2ccff0e826c0f031a9f6626fd127eda SHA512 32006c65ea98c9a3788d90f503166299c1bb3b3345c4b75cceb0225ed991320df6ccf7b86178e2cb435e12d076481562cbe8d7eb3f24ca8ee16cafaa2bc9d6fd WHIRLPOOL 607690004d666f1ac00a71b3ddcab262f0f1c4a96163b97aaf9f9990469ccd5169804461d183f0605a713b61944d8870c32d2b4058f2dd5e573d0227d20d12dc
-MISC ChangeLog 19450 SHA256 ac70fb4d58f06fdc951dd906d3ae9577e18d59e1dd16b4f0a776be54325b85e6 SHA512 6119378104d50507c3eca49466bfa488418c15e9f3fd6a27b2b16e974611e5eea2b087a0cb5d52e38fd96f7eac1e3d5a8c31b18ddd25d0327d2454e46e1a6ad6 WHIRLPOOL e7a5c3e2aeacd14f7055e293380af9292264186e63531aea3a3332032a82b8b68d10b52a8bb3b509b4ea502ce8848f9d8a2a74698159b16b18b388ae2a7e5a73
-MISC metadata.xml 159 SHA256 9f01104d3484792496faff4805eed0ecea2352a897151f3397d49a13800037b4 SHA512 d5a29b9f6ecddfc368dc0f1f8919cd3c3d6ecf2c7a82bc8d4c0dd51b7aa15561ed0462acb8ae39bc84f97e706e82d9b4b06357494f164f1648219f604b473fbe WHIRLPOOL 36e19b63a1b307cc200e1d73499b7477f73799db3909e71b5a0916084728351c76d400f65e2c8b3f8fffb2c9ba54c0bd235f785b47414178d98f11d64a9420d7
+EBUILD lxml-3.2.0.ebuild 2007 SHA256 86852664224d53d72a30002b10d52736e5c2e8d27c4d7bbffe0fb046ed804909 SHA512 cef9948e9f3e5ac7eb99fc3df2d24ab48eca6ac3ef9821f44db314445c76e08f763d5a81ff00126c1358a75016eb8c499544dac93a11922a079ab2b680701743 WHIRLPOOL e1978749afcbe6a2a3a09a11c3c91aeef0b7e4a91c7c7b5141cdebf4f6cbd89ffc0169c3f4f750baf6dc746deedc01e6bf91900b17c712376ffbce9282e5d4ec
+EBUILD lxml-3.2.1.ebuild 2337 SHA256 e896f46b32feed416b936e73dd04498b4792e18e5dc48a30b58ae58f50ea43d9 SHA512 e080823d773c2b0e66dc84672d75c6d33ddc73b2c52343227d5ff993941d911404a79bddc6892a72ef22bf88a62b01d0f862d3ff9a9ed88f611a1acef64a004f WHIRLPOOL b6f11bc80f7c24a5b9451204bbe550aaf376ddaaab5ae80303bc28cc247d684f3ab586cbb213d02e8ba2267411cf66b8d63445a7332122f65b5170f3aeb2457d
+MISC ChangeLog 19845 SHA256 76e384730eb3fe01e3b259eedb2c24997733137a6d416c0d9217444f3e71a1a2 SHA512 6e96c569dea9829285b7ef8de54a734d395ef8180a3e97ed88b796f68c4aee2f88b409e53586bf7b7cca2a4233e35ce42b6e507986ecab9a7100418862901796 WHIRLPOOL 0afb3cf96dcafe18d0084b63ec7ede4a49b37074603459828e2f58ac6cc1cafd932f907d8acc3454d0d26a6f4e6464409718a5873670213c135a58bb77f28b40
+MISC metadata.xml 248 SHA256 e7807b576fc37fc13cb9ad6785defe55a0dfeeb1c8d4c0765186169ef23fa146 SHA512 0f61003e05b546ed78531f3ed7e416a67ee0d13a76d238fb9907bf93b1ce732a8f33d66763e831f607c4b8c3739836627c4bbbe3569db6b0506142e41c45e0dc WHIRLPOOL 327f14c55f4be41d29c3ee1973e67fefc8df5c11925b88ebe989528ddac6b8ac85b46ae0d7520745c739ce3cfc60c0cba85875933af621cd6890e59c85bf5072
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRkr0kAAoJEEqz6FtPBkyj4hkH/RwGq8F2C8GZY2I99zDlHX2a
-C7ZGzNHSQlVk2uaau8fZtyKqiAzhIexXYRCMFTu9Sx6+8DUXBaQhzkxmxISq3Ky4
-bbyxMDa4ci/5PyzmVG4gW9DGai6srhNFUyMv2iCd8kcBaJeIzLKiaNBI1ljgPOSE
-UOViEUOrZELlOQJGXVNkxeFtjg/z1aTrrkHmgaWWGO/eKEN8MTHiO/6mvpjjkMTv
-Wd/bilsvQCg4tc45ruB0tKLLC4jajQqFtfMW9X2/IYlOwFo2G05zzSybovzIdVnr
-dZrVRhptNIp8NRgYWOaFqvAenA+b1asCUL9k4rOyGVQxlebKz+tJUFhcqX33ZLY=
-=wvxt
+iEYEAREIAAYFAlGdRnwACgkQso7CE7gHKw0ExgCgslETkeOhvuuIYlsoevptbdoJ
+cZsAoJXGJsUlOg3Ex3AjJU8W+l/ONkXc
+=tSsZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/lxml/lxml-3.2.0.ebuild b/dev-python/lxml/lxml-3.2.0.ebuild
index 7dadf1072a00..6e8c4a4e758f 100644
--- a/dev-python/lxml/lxml-3.2.0.ebuild
+++ b/dev-python/lxml/lxml-3.2.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-python/lxml/lxml-3.2.0.ebuild,v 1.3 2013/05/04 20:40:24 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.0.ebuild,v 1.5 2013/05/22 21:40:54 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
diff --git a/dev-python/lxml/lxml-3.2.1.ebuild b/dev-python/lxml/lxml-3.2.1.ebuild
index 1e1cce88dd6e..4b213e56d466 100644
--- a/dev-python/lxml/lxml-3.2.1.ebuild
+++ b/dev-python/lxml/lxml-3.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/dev-python/lxml/lxml-3.2.1.ebuild,v 1.1 2013/05/14 22:39:28 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/lxml/lxml-3.2.1.ebuild,v 1.3 2013/05/22 22:27:57 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_1,3_2,3_3} )
@@ -14,12 +14,18 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 LICENSE="BSD ElementTree GPL-2 PSF-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
-IUSE="doc examples +threads"
+IUSE="beautifulsoup3 doc examples +threads"
 
 # Note: lib{xml2,xslt} are used as C libraries, not Python modules.
 RDEPEND=">=dev-libs/libxml2-2.7.2
 	>=dev-libs/libxslt-1.1.15
-	dev-python/beautifulsoup[${PYTHON_USEDEP}]"
+	beautifulsoup3? (
+		python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] )
+		python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] )
+		python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] )
+		python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] )
+		python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] )
+	)"
 DEPEND="${RDEPEND}
 	dev-python/setuptools[${PYTHON_USEDEP}]"
 # lxml tarball contains files pregenerated by Cython.
@@ -56,12 +62,7 @@ python_install_all() {
 		local DOCS=( *.txt doc/*.txt )
 		local HTML_DOCS=( doc/html/. )
 	fi
+	use examples && local EXAMPLES=( samples/. )
 
 	distutils-r1_python_install_all
-
-	if use examples; then
-		docinto examples
-		dodoc -r samples/*
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
 }
diff --git a/dev-python/lxml/metadata.xml b/dev-python/lxml/metadata.xml
index de483c53568f..76cfdbee32d4 100644
--- a/dev-python/lxml/metadata.xml
+++ b/dev-python/lxml/metadata.xml
@@ -2,4 +2,7 @@
 
 
 python
+	
+		 Enable support for Beautiful Soup 3
+	
 
diff --git a/dev-python/ply/ChangeLog b/dev-python/ply/ChangeLog
index dd3953c13007..4544e2822da3 100644
--- a/dev-python/ply/ChangeLog
+++ b/dev-python/ply/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-python/ply
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ChangeLog,v 1.23 2013/05/22 02:03:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ChangeLog,v 1.24 2013/05/23 08:20:45 patrick Exp $
+
+  23 May 2013; Patrick Lauer  ply-3.4.ebuild:
+  Fixing dependency, thanks to amesists for the hint
 
   22 May 2013; Mike Gilbert  ply-3.4-r1.ebuild,
   ply-3.4.ebuild:
diff --git a/dev-python/ply/Manifest b/dev-python/ply/Manifest
index ca4aee0e609b..8cd565bec214 100644
--- a/dev-python/ply/Manifest
+++ b/dev-python/ply/Manifest
@@ -1,15 +1,5 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST ply-3.4.tar.gz 138342 SHA256 af435f11b7bdd69da5ffbc3fecb8d70a7073ec952e101764c88720cdefb2546b SHA512 6f6ee528393ff83eff2530ca468caf12e4c89b817a38302738597f1478dd41758036c8f32f88f60d1a26e70d9cfceab5530ddcfd3f058c1ee722be95c27e6bcc WHIRLPOOL f2f58e2d0c1170d35554999ca643c102d6821a7535b5782ee7317a4100cf56b5648d643c274cefd66a7b484ae3a9e952bcf4b98d50e7fd1ff220853f982a2f4c
 EBUILD ply-3.4-r1.ebuild 1007 SHA256 b944edac90b3affd8b47a99b5ac9addc303a7c77ee834f386055fa2a5f1c079f SHA512 1704f6b61fccd6acd1eb251ba9abe04e60494eaf1787616154b483f41b1d3482cc3e5784e2f2016478294ed3bea91ebedde32ac24f98551386c212026ef3a0ff WHIRLPOOL b10222a8a3869ac98b76fe8a2662657a7e86bdced5d0c2098528a33d7be7e00d581bc09f08da0438636f57f7cb6904aaf8d8341021083234ca6248a2b4d81c91
-EBUILD ply-3.4.ebuild 1187 SHA256 d733bf8aca062a42949188a5d8356e1f7210ed24ffd9f0cbbe688ece020aef75 SHA512 7beca36cac9e8cdeede2cfb8189ebd967bc12f9bef826d2e784aa4dc91f37c3d283972ed6300d8037787532061e8ab0ddf80dbdadbebf491cd5e3ba9652ecf0d WHIRLPOOL 7ecbc33df36728f7749e47b73ab6017f711aecb43a72f8c585d319d1f452df6108a055b719f6ff7b6f80ba27b77b5fed8db94358d1edf21489048c74b5690b29
-MISC ChangeLog 3150 SHA256 abdd068815bb19525e3313d6f686511236e687307f731959a5f92b3578ac00fd SHA512 2e1025154785828e0ea18cd1bf3ee99105be613450f769379fec828ce5f28c4b9c96970d1b63f5a10a3f952fdb6eb37736c425599625de834034537564ba99c3 WHIRLPOOL edb6b6afda6e5242f9b1f15930f0e3bc330f2e375d3754082c90693a66c07b65613cef011cd1df317c4a9b997e5e59f8e99a4719359810df47c5e625a626ed33
+EBUILD ply-3.4.ebuild 1195 SHA256 0a40751bd6b67eb42dd731c31acdc6bbe7b549021318b50340c3b1c88a3b5608 SHA512 2db3a59fd507be399c978306f62f16bb7390fefa48e1a6f65a2ab99cebbd4b49d32761147322e2c3720a9d9aa2117056be01d64b0110ac44e89733eb3a28eb92 WHIRLPOOL 9c9b407dba7ee1e6983aa21ff3156d4795467e15f60335f111306c86a2ede94de40f7e245061c1994f392301174ac4ae542cf3febd3a5d1b206159c944b955dc
+MISC ChangeLog 3270 SHA256 edc6e52e8c2b1157533ff151d0dc26665a4c759bc79f44677ff18f038ff8ab46 SHA512 b716eda0c727edf09f8199da653e6567d4049d9a9605befda9a2ae551a33bde1beb6f42f61ba6cb58d66922efc0e4f820df84c51faba7d40d5094eb5112d9367 WHIRLPOOL 353148d986b77b6332723f204d8024f734307c084e55fc3b872fff9c113392cc71470800c8f48810b1a6f60dda3d600d2cd701685178ae8a5d405208f691914a
 MISC metadata.xml 1268 SHA256 552871264db95b1396b369f4b152d1d467c6885804462efb9e53bd0a8a7426a2 SHA512 73836e626c98dc37f7c7af87ca20803d724f88186c1d36f5b6d28b9a53fff57a9c43fcf0ebe6726964de924e95f1f145564b1b0f2387d0749061f82dbd1779e5 WHIRLPOOL 136222ec500b259e65f1d6a06244bca8cedc7b31d70e0da0731fd2eaf8d5c0c86f789f7926d551281a20314edb123d737fba73838a78a415051cb7888858d5ba
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iF0EAREIAAYFAlGcJ4EACgkQC77qH+pIQ6S+yAEAtvc7FaBdmt/fvrAsFMvInPVw
-3vmu7bUMdK5UlCL+IKUA93lFnQ7HRcI22AWZ84gy4CYnaP2cg4i86lVHN/RAAD4=
-=dTcS
------END PGP SIGNATURE-----
diff --git a/dev-python/ply/ply-3.4.ebuild b/dev-python/ply/ply-3.4.ebuild
index 76f6c20c6a1e..ae9b8beae13a 100644
--- a/dev-python/ply/ply-3.4.ebuild
+++ b/dev-python/ply/ply-3.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/dev-python/ply/ply-3.4.ebuild,v 1.9 2013/05/22 02:03:44 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/ply/ply-3.4.ebuild,v 1.10 2013/05/23 08:20:45 patrick Exp $
 
 EAPI="3"
 SUPPORT_PYTHON_ABIS="1"
@@ -16,7 +16,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm ~ia64 ppc ~ppc64 x86 ~amd64-linux ~x86-linux"
 IUSE="examples"
 
-DEPEND="dev-python/ply"
+DEPEND="dev-python/setuptools"
 RDEPEND=""
 
 DOCS="ANNOUNCE CHANGES README TODO"
diff --git a/dev-python/py/ChangeLog b/dev-python/py/ChangeLog
index a2152187b6b8..719b2fb7552d 100644
--- a/dev-python/py/ChangeLog
+++ b/dev-python/py/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/py
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/py/ChangeLog,v 1.143 2013/05/12 18:18:08 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/ChangeLog,v 1.144 2013/05/23 05:10:44 patrick Exp $
+
+*py-1.4.14 (23 May 2013)
+
+  23 May 2013; Patrick Lauer  +py-1.4.14.ebuild:
+  Bump
 
   12 May 2013; Mike Frysinger  py-1.4.13.ebuild:
   Add missing ~s390 #469242.
diff --git a/dev-python/py/Manifest b/dev-python/py/Manifest
index fc23cf568ba7..a5f5adad9802 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -1,10 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST py-1.4.10.zip 225401 SHA256 b4607de3fe00363067e4e3f1eb6940ce096a8e3f3f835ed777b06a70387cd162 SHA512 0fe1bf8f02e199b4b4ebc363fc3763a181d18e7a4565cadea0e6b3e06afd2ae62c88b62c257e06a1914804e5a1bf69aed59a7899e4646c61e356a336d49b5045 WHIRLPOOL d9dada6821d871a3621214764edc0deaaf72ed2dce7eb325817cc9c386c61a0ac5b8078a255cd4d58ce0f3281637d7e602e3f56205def77777cc327378102dc2
 DIST py-1.4.11.zip 225526 SHA256 47cbcc8d8a29b319c561a32c514e2f83a364a04baa4345e78b3d6b8c7f781290 SHA512 9c20029190934b7dea9fbb8247cdcb53e67464585db4305bced84cca821d4d71beec911ed6b1112905c4a70f4598e7d6d3f0918250d5f6aa7cd2d39e5001e0df WHIRLPOOL 4d66ac6f97a25ea35e2e7baad46e1b3aaba6796598f9bd89fb9a505b7f81aa7b8c95044f2245669ae8597312aa40c626fd841e4369ac656c92bb5f94282acaab
 DIST py-1.4.12.zip 227103 SHA256 36767367ba7517375dc5c1cb066e4f8fe3e05b7eacf3600c011fb510cc45122f SHA512 7165580dc72fdaa11104ae8d897e9ef0f9917ecfe510f5f4ed4e7ee3893f16c5e4eb573b95759ebdc351492f68a9af5d89ecdb8a3ab186058e18a0d1bc790c2d WHIRLPOOL e842b3029a8018dae784cb3649b06f16eee4d2146b7e4d3f5b642c99d0a19e4d67517326c480d76752ac9d87c28a64423336582ab485adde60f39de6d44a6a50
 DIST py-1.4.13.tar.gz 189278 SHA256 ec1dc7fe04066e7ab93e1ac457f04bc301778a48bf368bf1796e84f500fda6f1 SHA512 ee07538dcd5180731fdde5f3f480b4b9bef88e77f125b9926d2787305d7339ca9b6d94a60e1b8f759dc325b1ec4277871bda8bfb2bdb5fcc0863304ecc6fc49b WHIRLPOOL 0b96b9576e0943962d8a14f4252ef60e77edee9280b6e82ff1fb29b17f5ad22071316a72f040756aab1870eef5f668b329fdd37dc6f962104438161f047897bf
+DIST py-1.4.14.tar.gz 188722 SHA256 a1915fffc0590a104fd033466469c7f074a1b524d1a08c7fc501f406a0d8526f SHA512 571475cab18bd5bd1e37244c6332500e2a086c402f5817e140a319fadec4ceed5220d098b1857f47031b623c2f61055996fa65d7d0be13f5483893f32de07668 WHIRLPOOL 53c1e0d6866090dc5ff74d00b72ed36ca1d015f3c47852e911200849cf0590f322b714fc2807b54bfec490a3ec059759914f0af2fba78a8c474374c3b640906d
 DIST py-1.4.5.zip 225478 SHA256 8425c7140cfc5acf5b67cfb2f2af8d835ab2f6663ee2ca3d7206c1d81e1d35ea SHA512 d82a28599d930508ffbd96e7bedb6a3655b176fc42310184c69a4befd868ea4d6c9936eb5e4e8d5d89482e6e925211f8517d767509a1ea8db072a7fba32fdcb1 WHIRLPOOL 2301988868b61c8f571aab92b73cff76a3b5470b4fb8af5fff7ab1b3721f03775032e80f6a3447147bd31662de9d5515e035b709ad949392dff4986fda4e006d
 DIST py-1.4.7.zip 227360 SHA256 b66ec2289357146be31a5a2050e1e298654da33c95a50b890bc09c764b905ff2 SHA512 091a4e0e73b3716ea91d343066eff0d05e5ae4d20c0416e63d75a4f8b243306eaec7cf8a0a740169f0db8085212a92fa4451393edf94e498d0cfd32296369e78 WHIRLPOOL 45b35cf757af0d60ed92b913fd899ce33175c31917d756a8dd1c1bd5ddf19bd30d59e9efec0192e11a44238acb64e3803fa16bb98d36651ba44cdebca435c1d5
 DIST py-1.4.8.zip 228276 SHA256 e29f881fc54919e0faecc2c44913d1c32ff6fbb7097889bc9b384ddadb4949a5 SHA512 a4221a375e2fb03ff5aa494bdaf29d361ba93d2e57671289c9e27a41c11b5dc3d4d3cae4aac84c7ca0637f44befba7a11f27afd356347c02151aa9f40d6adb32 WHIRLPOOL 32d4a88effcd79cf9fffbbab56ef6f138d008aa02f3e81ff826f665aa1e514c18e7b15df1c17d188b0f9282d00ef879f1881e16f3c038202b5aa54dfa5e17bd0
@@ -14,26 +12,10 @@ EBUILD py-1.4.11.ebuild 798 SHA256 680d3491c9524fe2517a1fdb921e486637a7f4f6bffd3
 EBUILD py-1.4.12-r1.ebuild 921 SHA256 dc3c0c55b688cdd0eef6536b6fd967204a71719ad184992871e79f67fd508448 SHA512 419fed8b91c67108f03a0303101e7d25d1230e412734a465ae9bb10e8fb2a0275f211396269f9f62d9f0b2f44cf35b61efe036edc57c792f0b18ceed87b648b6 WHIRLPOOL 5b442bd2db2c298481a9e34e47afb57b576e6796be1c5e0b7c315836d866f9afbe2ec690545059f504b74ad919ce5354ad16ef05b8e039f9b3c8999cc46f6d99
 EBUILD py-1.4.12.ebuild 798 SHA256 e2a6dec1daf47eb46eb6d18b5037765453cec831c284316d7b303f5255303549 SHA512 c682ccc8ad185f41cc2661ca94328c03b93b39dcab77f9ed0aeb6ab4cf48882a7541ef2b03e766cfb883ed5ffa8728e6ae19268123f58b84a810ab4e96f286d9 WHIRLPOOL d220bb1c219d7e0c7a11aabe01f6058fc01cbe693eb3f4f06453f7acb56c1c6faa284deab10ff14dc0b1b86749203ae3e6479539da51a01a8d3abaf3298c19b1
 EBUILD py-1.4.13.ebuild 932 SHA256 4a7cfd1f47722af30805379eba496f8a4de6c66b61441528ec1000bce66a1572 SHA512 6382691860b734bbdf6ca4a0e7ac3f17dbfe6efa56a8f28c57ee8095ecb6a3f1282c4634ca6769e575648871ffda213d16da06c9b24ed6f5289426fe2850a4c7 WHIRLPOOL 829725fe7dd7e04a6f5374e0ce51375edd1d4a109e2b9f0e241cd7470762a686f8334e82816093ae2069549b4bfe0d9fda5c6756ec70ef089cbe79d5d636a11e
+EBUILD py-1.4.14.ebuild 933 SHA256 163894bcade72f94e5e4a38e7d8d4730c82f00176469a03d35ce04321f6f05a1 SHA512 3cba638f005d810f68e3f7d1fbf8295593594b42e9302163a338582c7cc5069bcde41fd89ff7bc1f653bfbf59553aa1cdf632c88e5b859560b3dc5ce142bde38 WHIRLPOOL fe770ac4b5c1bf80dde2885f138f1bd1f3c44b265e5c7d6036747ccaf2bcefcd7628b617c202682fe4e93506cc1a27fd052296015b6b59f317cb8e9f2a171e97
 EBUILD py-1.4.5.ebuild 953 SHA256 1649abb4b5a71c14a30b8e1169cab87fd153560f48af8c8948dd8c5f35baa315 SHA512 6176c9c2b55e2fd3386b954fa672af76a97fc7ac11513517e365163811c5550159615065d1bc890fcbe012156fcad7095646a38584d9423ed6660efe89ac0e8b WHIRLPOOL f54cfb720dad1ff85c9f74ec5f0d0e35df96a35465c4dc6265db686d4a89e0b1eea8e9b4807ac080e6dadf98ccf3ec1751f27e1271931a940012379a0e483fd0
 EBUILD py-1.4.7.ebuild 965 SHA256 c9d40795947f59c59c1f6246512a415b15e5520b936ea88e1fe088451efc7b91 SHA512 221bfbf36f79d61705ac7de97ea026bd9e61b51b1bbef77d55d2d9dec621cb20bd21da9789f308fe997129910048ef3558a55bfbbd21e7dfec791c299747887f WHIRLPOOL d252479888b8f112185375dcf4258a4edfc9bec272f1b1de5808ebb23241bef0dc75904022855cf855e6e9a60af19841e60aee83b7e6731cf3f57cf659c5730b
 EBUILD py-1.4.8.ebuild 800 SHA256 aa91b9521458f27600a7f7df55d170b102d268220be6ca6954207b6920c53f51 SHA512 ab39a3adce3f24bfdb58150b2a43e018c1dfd3bdb49f622d29c61214a95e0b3ededf97caa8cc9fd55a7f24a11384a167b238de59aa97010faacf3e77da8f3980 WHIRLPOOL 0202dacaa43041a6f143c41837e1f21726d69b626709674258a910b2d31e42b06a78c8bbcc6934e279259f56e323b1666447bb2c11af2de860bd33fb89e875c5
 EBUILD py-1.4.9.ebuild 797 SHA256 908b9600a57f66491a1bed6831c46e687009925f3514cdbe6f8d1ca458f4cf53 SHA512 6eae51bbb401d079b312e04123aaf41fd7d4e6fba7aea6d1740d4d789509a290fea209a79bcd76e446ef9cac6fa7677eceb70cc8d363e4389a0c464349e80e42 WHIRLPOOL 0fa68a676c607716ab21234227ace8f3a21ac0a8423595e1f3898da31f18a6302208123d816c88ddb029da5dc60d70594bb8da7174164760f206b1554125ee05
-MISC ChangeLog 15205 SHA256 4f15035db5e6d9f46e9b103cbe9dd0db09478985b7f15902386aeac6a623a206 SHA512 727071d43a385a71c676db4b3633562f73f81eee414093a7f9557d6d3ba5d3a406026d5a58a4eb8e1bc7a57c5823a9c360cf2994ad2f5473eae2091785b3f584 WHIRLPOOL bfb9c997ffc2565bc2551d84330d58f2391350c9b4bea8c90ded4ab3c5bb151778a0f32d1293eabd13edbad7a1417ab99cc38e577c680063137f97b8bd5ecb1c
+MISC ChangeLog 15309 SHA256 ba1f962dfc5e4654c430c86041965ea5278adf481144c8de96a27653307c9830 SHA512 39fdf25cfa68836dd129e2568379cba061c68467597e710162fae9788a8fd70a110929d57641ddd4ec73a402535eccb9b9bd200cabafb41cfdb359d54e68b6c3 WHIRLPOOL fbcaba9a0a4b30a1bf8ed899a96fed54608969c3456ea6a1f21f5c1edb4cb537d8b3f83298b6fe919b62d7a21391f7d935f409a311ef1916a1de3365fdb3b776
 MISC metadata.xml 225 SHA256 a2bd33de0433ab613582213a92ee8f90e5d28a9cf6f3008cae1074de81b9eab7 SHA512 7e9415a5f09e432cf0e5fed2cfcf84a7d3d9c8e07acc35ca38c54aec18b5c41df4d7f0a27b92b6e5125faeefca83631f8e46728fe37d980e82e7a478fbbf12ba WHIRLPOOL 7e2f8ce8357b31c44361bb5e752fdd62ae27b16151ba1c395c6e6747f0aac0d908716fae58c4d6647574dcb407cae5559d622f01dadda86793045e6844e9f18c
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJRj9zlAAoJELEHsLL7fEFWYEkQAKta4y2bLDd1HYM9x6Gp6yNG
-MZB47UB6e2pDUd+mZwRJLr4cV3jJFF8tRnZqOmdN1Ei1DFIjg09Di/uiO2a1si22
-9WCqILpPD/vDPw+15N/yctAoS0QZHKrtmOenzhcuoFtNApFeeM4TcRwHtYbl8058
-9QLD/9tE4s1FW7GHCqOTfQNK/1fXwLp1nnT06w8/sQ7/840u+xY37ZE6WcTsJZ8r
-gepzE8RUH/hi01/o+n6kmGIsPCpijKVFqu/RJH14fm4va9AUyMYqERgL3Fmt9gdS
-t0cmbvzdfolpm3pR18ZHQ+a7g9uLmzUDUdBVgZmJCxShJ6CmjF68+FwYRk/oSaiG
-RY+rO8JzR0An7wvKnlZi70i6ol4y8ip70OM8+S1sfSCi1iuWL8hKPadymZX5Zp0B
-OD5G0utgjOdZsPoWKXDMXp2XnPcwFVTxq19Bjdx1f2EK/3R10xlqIRpJrhA557J2
-AijjhntKMPRIITz56jhNYpUjPK1kvYGILMIMmnc2Q7jT3hxgSp4etywUDVcKVmz9
-eC2xe1TFjpHh3XLAoSncFdaT9uCTOCWGYY7/9Til0LP+V1NgZnOEhrgoWpotVFD6
-EFJWBAM+9VIFPjzH7dI+6/AN2WoiYn4I2WuFE09IwEdIF+1mHMDgadpvzQ3GsY5D
-ro4YYW5kaVH8BiOyN3XH
-=6WKp
------END PGP SIGNATURE-----
diff --git a/dev-python/py/py-1.4.14.ebuild b/dev-python/py/py-1.4.14.ebuild
new file mode 100644
index 000000000000..ba15d23adf01
--- /dev/null
+++ b/dev-python/py/py-1.4.14.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/py/py-1.4.14.ebuild,v 1.1 2013/05/23 05:10:44 patrick Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_8,1_9,2_0} )
+inherit distutils-r1
+
+DESCRIPTION="library with cross-python path, ini-parsing, io, code, log facilities"
+HOMEPAGE="http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos"
+IUSE="test"
+
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( >=dev-python/pytest-2[${PYTHON_USEDEP}] )"
+RDEPEND=""
+
+DOCS=( CHANGELOG README.txt )
+
+python_test() {
+	py.test || die "testing failed with ${EPYTHON}"
+}
diff --git a/dev-python/python-memcached/ChangeLog b/dev-python/python-memcached/ChangeLog
index 9c04973872fb..daa7be679d16 100644
--- a/dev-python/python-memcached/ChangeLog
+++ b/dev-python/python-memcached/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/python-memcached
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/ChangeLog,v 1.24 2013/05/22 07:24:45 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/ChangeLog,v 1.25 2013/05/22 14:26:54 idella4 Exp $
+
+*python-memcached-1.48-r1 (22 May 2013)
+
+  22 May 2013; Ian Delaney 
+  +python-memcached-1.48-r1.ebuild:
+  revbump, migrate -> distutils-r1, closes Bug #469856 by kensington
 
 *python-memcached-1.50 (22 May 2013)
 
diff --git a/dev-python/python-memcached/Manifest b/dev-python/python-memcached/Manifest
index 645e457b07a9..c1c2d24050d2 100644
--- a/dev-python/python-memcached/Manifest
+++ b/dev-python/python-memcached/Manifest
@@ -1,8 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST python-memcached-1.47.tar.gz 37465 SHA256 59c5139d0a8d03e9bd796c984d0cd75b94ef955578372158152dacdfdfe32fc3 SHA512 423067ae83bfda9f6d139fe05f0975d4ec92ee18750b1a1996aa05c5c92abab48096d0161d60439955a39dbfe01c3edcbcc272648b73ee4ff60455bc681ab5d2 WHIRLPOOL 87ec82d07b907c8df89925d395318a1226440af349e2ab3ede8aa0940031cbe8690f04c82d3fadb26c5a3035b35d643f1ee21036711147a28e19816edf8599ca
 DIST python-memcached-1.48.tar.gz 40448 SHA256 66bbc62d9519f9d531b1f77e687d9f2f5e521cb906f1fd7231f403997e0110c4 SHA512 dff8938dca41ce16ae34edcdae53a207d8eb1c1693af8d1bff2c77b2aec957423bde600c835357d153d42551a5a8b71b5ad25e942fe112ada0035a77e39634fb WHIRLPOOL 03d02ff77308d2818ea98318dfddd574f00427cc0a3de9d9bdf30403ebd700e6a275a89ae39d7d70dda72f655bacacd1dba78e04b075d1d32b79186429d07203
 DIST python-memcached-1.50.tar.gz 33927 SHA256 d36fab776b1a10ac1fbcab40a71f0f98387976252dbae78f9383b30e8204a076 SHA512 09c77d5d7130bcbb5fc5a391a5e5680d43dceab78adc5e8c06db3877de1cef764d7ef86d20b33c825fdae6085232b64d2f5241ad9f6974513df6a9935297c85b WHIRLPOOL bdf128d77c2417433f668d312e7c16cb603a303dfb7045c944b95e24f6cd5110e6a44c9ce6916f71de197e3c0830775c60b64d82442759ce8d08c097fae3464d
 EBUILD python-memcached-1.47.ebuild 739 SHA256 5362c8994667d94870488caabfe2fb3a4c146010e757e52e6748a71aac93d72e SHA512 18298a8fd0e1606c771052f81c349b4af6ad088a19866db9dcad9e9e06ed692c0c60d9766ea1a4182272ce9eb783613e2b6eade068f9bcb183b5a78475e69718 WHIRLPOOL 591a7242f12ceaad3238b4470655bbfcde15c8776e8f4ed6ecdb7d4ccbb48e58aceb9502f8294f14e8d7c14118402375b51b94de6cd2bb894fd3f4bd3e80e387
+EBUILD python-memcached-1.48-r1.ebuild 1120 SHA256 b42ae3f4fdb7b2eac6f1fa4f489509efe2a940f98bb95acc20e5d2440ebb055b SHA512 d93939bddc3d8b50d7095b8991c6c1b1006016d7ac3db78f5ca363af4756c55773ddcaca469ac200b8454e07c12bc8f59936d941d3ad879297d938dd314e0029 WHIRLPOOL 57aa1f7a5213bc9100f135607906ef2d7c64a2ede23fe6e4b7221dbab7e8a19d9d1f414a4169580ae52017bc81ec71d547dea10f5ced1cb8280f67191c213e61
 EBUILD python-memcached-1.48.ebuild 1139 SHA256 7c5dfb0d3489910c855fefb34cd6fe6b974c5082033c4909b9bc7c0cb398a773 SHA512 312790930543c37fa6fcc9f409cfa1861b7cef55766342bec6eff94c9767aee755504870df7a4e27eb77aa2a7312c7b283c5a2f38d59459e20fdb15c6c4befd1 WHIRLPOOL 6bb69da674659316ae7d43130981b2f219c30a655c613414088463105f5d9e7a136e9556a7113a43e3cfade317668daead4c5ecb5e4e2c8af9d4048f7eb20413
 EBUILD python-memcached-1.50.ebuild 1139 SHA256 a1b31a422ad94e9d6f093dba938580d96e3f0af3099fa5f653b6464ad3ee1fdd SHA512 834da387a692497e7233ca8161bbf3e0a2cf768315cb0e57c35a9ba3eac760386f1288479aeb4a0594aa20ccb3325ba40619d8b3b0cebcb6c8a0d43ff17ef88e WHIRLPOOL 9ee63b9a65168a2f8adb67fcf5ec7afc412fefdda93391f22efef463d7970ebeb016ee4168ea14308bfccd4215d8a1a4984ab418d0b4af515e1de84c43b9268d
-MISC ChangeLog 3358 SHA256 b7b0873b017e15f09aa7e7acac91a1a3b9facf62eacfc50f18925475213a5b21 SHA512 9145bef6be217eb669ce14e0078283c72e0689e87c1eb882604d1b14d5fd6ce4a56bfd6dbff439d503e4c1a7418b12685719ce97e4b04d2a513b228433f04e54 WHIRLPOOL d9957daca353b1e624cfab9755ed8bab49034e800568b33f817e55e343b10bdca4ad625d33c7b05b88d5e3e4d535dd3e300c037d5f68e063abfe4f619c4762c9
+MISC ChangeLog 3553 SHA256 a73a2a649fcd214d4df627ab3f9451eba6a3259e552437a3ae9e3d5e1ee49b21 SHA512 f890917306a8ec9498a8661ee513d605c51a2794cc453ab0d8990a3801a50cdc47efe2151de2fb89e180f0a219088ba9ce8091910bfbf593d2aa347a23b03b46 WHIRLPOOL e00469bed698acbed37825996ae431f3e3954a8c3751225eb221d10b41d0fe9c77deef756bbc390a480260dd30b002733646646bd456cf1a9054678886ae97b0
 MISC metadata.xml 431 SHA256 4a7116ac4a2d70cddbab6a7ea152885ce769ad4887f42860c73d7a0026f4e393 SHA512 14087d6aed97a1f692a410055d097f095c808a028c769ee356293437bd8f50a10de6c34fd73650fb406622624afab1ec99b33fefb5fe50912e6aa0e6fefb428a WHIRLPOOL ed4bf092944f4ecf10a40fcf795480f67dd6d6bc0d88c74b67ff35a430dd45e120032ecfb233a1cc7a77824ddde14df6eb07c7d4ca0d86bdac30f817c0e41df0
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iF4EAREIAAYFAlGdSGwACgkQC77qH+pIQ6RClQD5AeUzwUjvlHDImDFo7iUqrrqT
+2qXWV9fDwSrFpPFy5+oBAIxDQZZaJdB/sqQz9AzUiLPXiUsNke4fkG9xHFbtqpm+
+=XuzA
+-----END PGP SIGNATURE-----
diff --git a/dev-python/python-memcached/python-memcached-1.48-r1.ebuild b/dev-python/python-memcached/python-memcached-1.48-r1.ebuild
new file mode 100644
index 000000000000..9d096c2d058f
--- /dev/null
+++ b/dev-python/python-memcached/python-memcached-1.48-r1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-memcached/python-memcached-1.48-r1.ebuild,v 1.1 2013/05/22 14:26:54 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_5,2_6,2_7} pypy2_0 )
+
+inherit distutils-r1
+
+DESCRIPTION="Pure python memcached client"
+HOMEPAGE="http://www.tummy.com/Community/software/python-memcached/ http://pypi.python.org/pypi/python-memcached"
+SRC_URI="ftp://ftp.tummy.com/pub/python-memcached/old-releases/${P}.tar.gz"
+
+LICENSE="OSL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="test"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+	test? ( net-misc/memcached )"
+RDEPEND=""
+
+MULTIBUILD_JOBS="1"
+
+python_test() {
+	pushd "${BUILD_DIR}/lib" > /dev/null
+	cp memcache.py memcache_test.py || die
+	sed -ie "s/11211/11219/" memcache_test.py || die
+	memcached -u portage -d -p 11219 -l localhost -P "${T}/memcached.pid"
+	"${PYTHON}" memcache_test.py || die
+	kill "$(<"${T}/memcached.pid")"
+	rm "${T}/memcached.pid"
+	rm memcache_test.py*
+	popd > /dev/null
+}
diff --git a/dev-python/rdflib/ChangeLog b/dev-python/rdflib/ChangeLog
index dffbc9e259ab..2788feda54f2 100644
--- a/dev-python/rdflib/ChangeLog
+++ b/dev-python/rdflib/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/rdflib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/ChangeLog,v 1.26 2013/05/22 10:07:13 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/ChangeLog,v 1.27 2013/05/22 18:36:45 jlec Exp $
+
+*rdflib-4.0.1 (22 May 2013)
+
+  22 May 2013; Justin Lecher  +rdflib-4.0.1.ebuild:
+  Version Bump
 
 *rdflib-4.0 (22 May 2013)
 
diff --git a/dev-python/rdflib/Manifest b/dev-python/rdflib/Manifest
index ebff9686dac3..df491ba2e909 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -1,14 +1,26 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX rdflib-3.1.0-test.patch 626 SHA256 f68166e8169e8dbe54bbbf1930ca7c0b41c8a7e9a3929703a1b6be7dcf7b9162 SHA512 9999e8f76d12403da3415810676c98883620a66e5cd98f25fc1df813bbaa9dd94f6fd561679af3fb146e0f2a4b242c2880cc9ba782d6b446c05f4726da79f089 WHIRLPOOL dc0efb99e38f6fcb9a30c36d427a07bba566b8d4142cfc559e0d55ebffa67419e2fd904ff45b62e564501f52bdfb7772b5bb43eaa524b389abee7c62ba5d9530
 DIST rdflib-3.1.0.tar.gz 249824 SHA256 eafa2a6abfde24f08bc8af0b43084bd30a00d94579bea9993643a8b438098043 SHA512 e4beaac8d593ad45bc315075faf99beb1580548b354410edfd7774fbe90a7d9fbbdffb7709b338009e91d796d0ac4fba6a780be5c755c631c7b633f194e9b74e WHIRLPOOL f7d0de5389e0e818954a533b0456dccc13fcdfc197cfc88a3e1c3b1ce3da1399ec681ef242507ecbe74da3a4e0de64459301a8a7ca7524285b4785e47d09a742
 DIST rdflib-3.2.1.tar.gz 439814 SHA256 b1193b3614bf8f57793adcff0d0bbff9ed67a667849302c4f46192eb34822b21 SHA512 9cd8bfb3afcc70e7c5075c81f86c8e137a1c7b4675cc090306fa7925786916423db31111d860821f1a4630f4a76b675a5dfa3f6b5fe0cdcb590bc042cd48288f WHIRLPOOL e952f4cc81d0735356f466c55f34b288e1e864c1ccc8b4d9eb3b4729c83b42addbb58b0a598b6ca4ae9de361ad37f88bc757d0872c7960be3695d451fb644fc3
 DIST rdflib-3.2.2.tar.gz 448846 SHA256 996b5c10b3303b10f155665066174c0b4cb1a6b756f8124eb92eb63dfc9a6a05 SHA512 d5f3da670cbaf929255c0540374d0386d248e2db0c48db0b8c0d6e9e53ac0109d35b22426f168a19d2bf52769d34e3237ca6a3f82c8cb3035a87b03737f99040 WHIRLPOOL 95c7f8bf25824a0b36c1ee2abef9a3ae104201a84c500ded474f52530dc460b620a5d595447b422757d3bea07f2dc974d104492740cb306f57e5ae88cf37be68
 DIST rdflib-3.2.3.tar.gz 449077 SHA256 a3cab51c14fa6fe379261e0157c110d94e2f75ef62073ddc76fe56f5be624b75 SHA512 92697be6d6bba4e31303b46c2a42defd840770f75c6f359b7338fa3d48a2001cdcda3b6319403ad0c9f1696051d773b146c9b012770df81b4d94a34d30f6b02a WHIRLPOOL b41794febee280022990dac8c4e177660f69803f01fc14ade194015bc6cf1eaf23164620b09cf1123445d181c0bbe9f0733b901cddafb126bcd711d0462a9f7b
+DIST rdflib-4.0.1.tar.gz 903633 SHA256 5e8cd9b9f09d69116add36229e05d7d2fbececee1ae65dc17713c57e823a9813 SHA512 a2050a127039c8e6959ce087ff3d0a663ec0e9b7891e253a1c66be8e04dd99aa203e34c0026d227cdaffb8a203a385a8c42abee073b420df0e11ca138fb459b0 WHIRLPOOL 86f4f3b52ff08bca9698a5257bd32f861506b498fb6febfddfd09ff42c580f30314079d781ea56bec242e0bf4dfe57473d029e66fca49ff88078ff390bc1fe08
 DIST rdflib-4.0.tar.gz 838730 SHA256 eea954733aca41783abd9a960c84e3c32a51cb3cb620bdf995552cc7195f70c6 SHA512 d49ced6c4e23cd231b5266b2e6de09a1cdb7e59d14dbcce4b669a626f59cfc71cc7b0b9ddb465adb50cd8228fc456f98846f09e653bb1fba572c05a6f5dd18cd WHIRLPOOL e419c3d63fa768e639aeb5ee304cfbada93263abad7c55d0ac4731c4d24ccef4284a132b7f0aa054cbfb693b2cdb2423e4d46c54b9726cfd9684ae888abab5ec
 EBUILD rdflib-3.1.0.ebuild 1334 SHA256 d475fd8131756dbf96a07b54eec3e3defcacdd92711d15090ff278e7eb9b66d8 SHA512 c76f5c401c7df4c9450328a31ca07086227a67f2e929079f42a36106880353e941aed56f84e1a676d11531893d3dac4f8e74d84c7fd9c85706b9e3c1d2567763 WHIRLPOOL 7e38a2fae64f62bb43dff85b616a4afd297605937f506712dedee3aa36c9ecec123dd3f998310362e9d18fae79cf46c5e9f3a89be11884460aac96fd2d4ffea5
 EBUILD rdflib-3.2.1.ebuild 1159 SHA256 6eaa6c21de83a13e658f6d5646388447b8d3dac8ccf646dffca7eefb197680f2 SHA512 d75eb3fe1d4c8c7e43babada9ee193f8c0a967b84dc60f21d39f98451bd133c0b2db91deab37be37796386b6452c8f7dc820ad682c54c37f352082632ab84675 WHIRLPOOL 4f397aa9091299b4ae203d2ac2593e9d7e26d18de588448b43dac0e9612e3db67eb7db72a713ef8f479fa17815dc8de306226fef1216fdd102b704f0d38e9014
 EBUILD rdflib-3.2.2.ebuild 1163 SHA256 ffbbaa9eae71006c602ee5653a6221735521c8f04fe0dd7c8a8aac8834be814c SHA512 ff6938bfe58dd173bd0a849c0b178fc06b240d1244c5bc4cb2bcf022fb08f6ba829f3662a41cbbf82a1191393baddb6e033fd592d2eb15ad855722be81ca7f0a WHIRLPOOL b650c3d90fd913123ed2846734b719a1e330902c2855c7d4b2dc1a82e374e3a95f1337b03da6c78cf3414a2bb72a7c427677b248bc88d70b78e3a6d099528c91
 EBUILD rdflib-3.2.3-r1.ebuild 1480 SHA256 f785ee28c324278845a3ae6c10a264720c2c4063ea8e791ddc7790b1778da7d3 SHA512 53d96b5723dfcc42a30e3c213755379f7efec5265931e182b1b73ce1b16b23cf7a253fa933ece2712043b3c55d4c1c5262985afbcd9e6a255cf4332c860fc7c6 WHIRLPOOL 2a4f76f54701b0b9f39692a0f953b9adc85395d0868fbd0ad5327831b124754f85e0114d4e3228134517f633089363c2eab97221ff562797ede5b94d4a615f73
 EBUILD rdflib-3.2.3.ebuild 1346 SHA256 c93874f820171c192c7658d93b569ee7db372955f4c4c84ebecb052f92b73c42 SHA512 0c606034849dc5ab450307c92764bbb971a03df835799026cc8e98d8810611c3a57caaeacd42677fad1656b71e79e8a348988880e13bf338f48acba24deefe2a WHIRLPOOL ccb02ad8d156a5e5d67ee5db3f8749ba7a70479243ab8d399938b571bc04872b6ddb9530425d3de3a217b2ee8ae1ef3ce27cf53e419fad685a9dfca66404c22f
+EBUILD rdflib-4.0.1.ebuild 1592 SHA256 d049862f313d4d71b1f78c74670eb6817fac145b2794939ea7d37879bc3bb9eb SHA512 96b3810ab9643360a95853e8ea0b336171775c4ace63f3dae0a073358ecaf5effcdddebad803882ac8f5deac8527db4dad0368a985967926268bed8ee1c406d9 WHIRLPOOL 978dccd2a88962c588fe41d8d7afa05acb3956c79e2e97b5c20ad92a7f6559194386b51c951ee436cf71e50a82e404801db1dfcadf6048fce9db5f9c7f3da42a
 EBUILD rdflib-4.0.ebuild 1529 SHA256 53feeeec92897b7476490f2b070277480afdd9adb873e62c02b4b9ff45268955 SHA512 0b077751767146ed44d03787d06b1a0a0dd32175eacb98006d4bc76648529a05ac34775e5e53804e58c2b2e4ace028edd827eda0a80c5657aed020510b8b63ea WHIRLPOOL bd7b64098f2f21c5302289430f8cc61a83a61e5f98121f37f8bded591dd24a4a89548832cd58ad3a4ea02bab4209eb5d4f4b005152d1c0a8f14c23aa4e6d8500
-MISC ChangeLog 3795 SHA256 ba2db84ae453253b0dc85cf380f26e57006ac3128d774f6ae010de9fb143725d SHA512 04d9451b7ff2a9d120bfbed450b6708734fe4da2ced9a22a2eddc56819dd26ceaf277dcc8a9758f2d7d66b9849dfaa7fc4b6bf859736b4ef887c87f3921992fa WHIRLPOOL 6521831d56f2e89c66a5f138a684ddbc8c69fda5069b117fe81b59b3e2ae47cb11a588805361d739209a66215d57f0dd10ae613ebefabb7ceb40a763cab8d7e6
+MISC ChangeLog 3906 SHA256 96421a37f933920b32d6a3544c66b7b1fb5af791a9324c7cc44d47805cfaac2b SHA512 0545dafb78586aec29128ddbd695ff210706538406c85b66a58fb979bb228b81a76c4863ce6647b9e30efa2aa5be7fdbefe1a82d3c12c82c07515bb86b47d42b WHIRLPOOL 98e426588f0a662dfee7060c7e8d133bc81f0cc4c052d7abf0f75eaaccb8cb1b09f669d76febaa31a0590c32dd0f955256cf07ee2a6b9be8a5ca098292d78594
 MISC metadata.xml 322 SHA256 aac421d03b45f0f65986c5bfc828aaa6c64a0c41f3fa111a8b10769068b8ff79 SHA512 a1ac9fff292c34551a2d2a65bc09b397f7d1648d84390abdc70f28eabee83e34e3ddea5ec095f094178dbc90afb7981d8094ff4bca599adb72ac16fe1864278c WHIRLPOOL 374562580052c63994f20db59f93f0b80755425d9ce2f800d0f44f32d52c849999e9e0efb38f2573381c7e7ad36fc6f38568e5b007a43e048d47f6ead875f9c8
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREKAAYFAlGdED4ACgkQgAnW8HDreRY26ACgz5vV3b+pMdI0Ob6numdfEoC9
+jF8AoLiKTtVkZ/OGz2KMr0X1tvkUKzcm
+=8nmS
+-----END PGP SIGNATURE-----
diff --git a/dev-python/rdflib/rdflib-4.0.1.ebuild b/dev-python/rdflib/rdflib-4.0.1.ebuild
new file mode 100644
index 000000000000..43dd2350e79c
--- /dev/null
+++ b/dev-python/rdflib/rdflib-4.0.1.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/rdflib/rdflib-4.0.1.ebuild,v 1.1 2013/05/22 18:36:45 jlec Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
+PYTHON_USE_WITH="sqlite?"
+DISTUTILS_NO_PARALLEL_BUILD=true
+
+inherit distutils-r1
+
+DESCRIPTION="RDF library containing a triple store and parser/serializer"
+HOMEPAGE="https://github.com/RDFLib/rdflib http://pypi.python.org/pypi/rdflib"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="berkdb examples mysql redland sqlite test"
+
+RDEPEND="
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/html5lib[$(python_gen_usedep 'python2*')]
+	virtual/pyparsing[${PYTHON_USEDEP}]
+	berkdb? ( dev-python/bsddb3 )
+	mysql? ( dev-python/mysql-python[$(python_gen_usedep 'python2*')] )
+	redland? ( dev-libs/redland-bindings[python] )"
+DEPEND="${RDEPEND}
+	dev-python/setuptools
+	test? ( dev-python/sparql-wrapper[${PYTHON_USEDEP}] )"
+
+REQUIERED_USE="mysql? (-python_single_target_python3_3 -python_single_target_python3_2 -python_single_target_python3_1)"
+
+python_prepare_all() {
+	# Upstream manufactured .pyc files which promptly break distutils' src_test
+	find -name "*.py[oc~]" -delete || die
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	nosetests --verbosity=3 --py3where='build/src' || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}/examples
+		doins -r examples/*
+	fi
+}
diff --git a/dev-python/sphinx/ChangeLog b/dev-python/sphinx/ChangeLog
index 9bb97faafafd..5c4376c9f4bb 100644
--- a/dev-python/sphinx/ChangeLog
+++ b/dev-python/sphinx/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-python/sphinx
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.134 2013/02/15 19:07:55 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/ChangeLog,v 1.135 2013/05/23 00:31:17 floppym Exp $
+
+*sphinx-1.1.3-r7 (23 May 2013)
+
+  23 May 2013; Mike Gilbert  +sphinx-1.1.3-r7.ebuild:
+  Split the dev-python/jinja dependency in two to allow different slots to
+  satisfy it.
 
   15 Feb 2013; Agostino Sarubbo  sphinx-1.1.3-r6.ebuild:
   Stable for x86, wrt bug #457156
diff --git a/dev-python/sphinx/Manifest b/dev-python/sphinx/Manifest
index 9da77b636aac..a78c849a7f2f 100644
--- a/dev-python/sphinx/Manifest
+++ b/dev-python/sphinx/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX sphinx-1.1.3-docutils-manpage.patch 1310 SHA256 97d29af271a833188245399912fb459c4182262138411f9f745821493507977f SHA512 340340215c5549aa3d59afbfacfef9e5b08a5d22700bd8d2391edd38960c5a5f4db95abe2c052f01fd4873852ce2dbe485f9a87f0f2fc8689fe8b3f1fa064521 WHIRLPOOL 9d50448b9c7fbd7cc95e4675df2f2be79b15c654d82f7f0740ff7ca3881e4227005eedc0ad7bd6a12548c71fefd06479a5cec1d255e089c0cb39fa9ae53257b9
 AUX sphinx-1.1.3-python3.patch 1793 SHA256 f21f0f4f8b1f83660344b7b8c1512f853d579eb2938e7f6b4305008252824f46 SHA512 c7970403bc8f6d329a5e9c5abf0ad0a7465f1249706f5ca7cffbc374c5214c14903b524c415df8bd14cb7c2f080a19c96ddbba77f7fc8ce0a699b36005fdbb36 WHIRLPOOL a7f69a5da9f258ac583a86046547362c1c3547187f4074eaec4b605b6a09ca9a070f4257a3cb6ae2cd2fbc3a33c4e893c313741625cee3f482b5b52dd8116466
@@ -7,22 +7,13 @@ DIST Sphinx-1.1.3.tar.gz 2632059 SHA256 34dc95b70a2b07a61b5d61034c34b05f82514aab
 EBUILD sphinx-1.1.3-r3.ebuild 3573 SHA256 86c4b9339c1f8e8456e39b59686ef264f743d386c3888d2202584f1793b6ce96 SHA512 0d42c768d620e2e2b76b3b769bd5961748c7dac865fb3a596028675136fa6f9d99ffa73701221b090d1c985f55c125ab270f61c319207358292dd8d02cb4e1e4 WHIRLPOOL ad7694e9c9ca90d7725b46f24b2caf649d65c6878d5dabc6211d0d206497c5c179af60c8f239a050d4bf2bf3b42a730ef2658e6e4e6cc09e461cd176539f8a87
 EBUILD sphinx-1.1.3-r5.ebuild 2961 SHA256 e93bf8e6c6e57dc86f442d11c0bc9af37190e40e7186334fdd61e3e10a2f20e3 SHA512 ecf72879b6ccb38d446b6732bb796c66f1a72d13030ed7edb913ecd4eeb19c92c4846f85b4efd06f2559ab7902acbe4c704d0652d8866ecb9f72983bab255379 WHIRLPOOL 6a2b4e96d02bf2e0a173e1ccd9ed3221ea735a2c3af41413f6509ca0ab147e59653a60a4a0235a0ca43a75636b07617fbb1de4896a2c130a4d1bd841e96f1cec
 EBUILD sphinx-1.1.3-r6.ebuild 3155 SHA256 081066a4cd955b2249427bbdfe8f31dd4011048f873598caeeed5ff9fa530a23 SHA512 e9279dd75da19c7fec0e4bb019525f1506de61c3f75e53bbbec101526db460969876e87c217fa5018709938f1509cb66f03bd79447fb1f001a6b3d9874bb294f WHIRLPOOL cfa58501ec291e2121bc4d057ae8c58e133a2ba21121c9a633f6d1f19c80bca628b25609969ed4ef54d9c568d268e983f2104b7c6776c78cc0fba409d0d9c97d
-MISC ChangeLog 16645 SHA256 b0ee9cdafde9c421d72485e0d8e0fa98a9c14ae07bfa3342403e5c26e436160a SHA512 94eab96638393d8ef563fd14e6cf6d93098da16fc481df4b81057019bd78fc929add4b54a88db5e5dc2205f99d7b18441efdff62c73b55ffec19ac5e0eb5707c WHIRLPOOL 25f61c443adf3fdef1d52a687edbcee999a1db018bbd773f0446cd93cc3950154b68d60da6ccbd28325cb1c256c84ad48db212d04645c7d7de6ef3ee0e1ecf89
+EBUILD sphinx-1.1.3-r7.ebuild 3320 SHA256 068566393fa12bb8d3f02b570f45921f137ea955320f2ae8099f63c29b5b637b SHA512 eafbaf8c9fde23b243c3845c60da313a364ad9f05144f2bf4be05e3327157b6ff5b64a3f6ba61a3107f88888fca575d45a6e1832c6252a8b278055ef18e07997 WHIRLPOOL b9260ce034d45f6c1d3703061c9e0468afc860109fd66829285e85507c009f38314a61ca071befa097534e12bf37c703ad7c064cc78c7ab8272b3c7571698085
+MISC ChangeLog 16845 SHA256 ad259c2172cf9f28b46bdf93ad15a610af21711fbbfde79f6c97f53ec8531690 SHA512 31f82553738a648f3a731ec307d0e6d2c7ed69776537b0db57540c946af02a5448dd42b8a9bed8c8a51ca853d8128aba3754c137a0ee2091bcdf00475565ecf9 WHIRLPOOL 7c05d3a72c6a8f11618e2e9d3f2eaf2993077eb0055bfa2b13bebde30f586e2426c3ba88aef63f2c9ee7fa178f3d44b1c39835a27af7d28d6d8abad08ae54ed5
 MISC metadata.xml 410 SHA256 ec32db3e710de4837b3b3f6077a1577fe318faf0b00976a972d4e269d7bd3367 SHA512 fd9b5eefde8b8f976e679f754281b4a5a07b62bba71820cde1b109ecc33c094ea08a6f904501b671bb309a6d23a1290a2e37e56f9b0902a3704a03ba4481b3dc WHIRLPOOL cae66b5efcefd9b3b8c61845fa1c77b38641eb16d63dfe888fb7eaeac713d6b4722727c2edf03330f1a4bb9144f4f4f26f886e3de509bbcd72b51acf94b46c95
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRHoeMAAoJELp701BxlEWfrTEP/0/x6/xgxJSXvm1anXUkGHeW
-MNKmdqjBZ+1PYkKRwaM0Mgq27leoTk10WWRJdd634j60jgdIzVPDPKYMQp+bPiLM
-12ZUldgeghRxpYA/9pyqIMqBhCON80J+Q2VxzrtpdKou62q4XQU6yb9xbCxPDxlf
-9g3eXiOVFpeSbAlfyqDNg274pcDCoxhgXVkwk4eaDFePFI+tvbiDYXOVhf6RJIP0
-+AD0jHaveQU84AWBEtZytJtgY/CgoGQjywbP6KTulP0sezBRbeL52zZFRGJNEO9w
-m0QcrUq0wtTNzwdcUZqfdWP2yOZRjna2VTd4rGBTXDWDZyD4mPf6jT1QMB9J/hme
-01VAS4XukTt/P2lyudc1YKjzPk2r/xnVCr/QKi2GM17+ouAXkxe0TK2Dw04q8m3X
-vsCNMq0upL4AIlHaU682GWa4TTkzwzaX42KBRb+asR8jveSerqxqFb9FL4o04fvn
-hMtgIZQ173Ka4XyCmngmpuOsNwCCZU7ire9Kgs/b4jOpdxs+9lHZSNpm2R1c4cg6
-XqAXm0Wqsto9BZuMtf6+HMKfem9JdcWS8KMGOvpBI/mWgacC9K4p9OTDzAuROov7
-Kp6I0xD0CZZO1QLEQXVc99rVgvLUsWr+CJ8H+pXw0l0D8Zpwaphdc7Fj2xJxhylO
-kEuLUa0RbxvUdL2LyUXu
-=vG4U
+iF4EAREIAAYFAlGdY1cACgkQC77qH+pIQ6QUcAD+MoQy4R5u/KMuHCxO57e2FAHm
+wIO0ZX0H9+/OTXhGLU8A/38/XJPjmwBdRUEAkgDIfPlvRuqwfYXgnL5wBKS/rZUI
+=vfJZ
 -----END PGP SIGNATURE-----
diff --git a/dev-python/sphinx/sphinx-1.1.3-r7.ebuild b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
new file mode 100644
index 000000000000..a156c673e9a1
--- /dev/null
+++ b/dev-python/sphinx/sphinx-1.1.3-r7.ebuild
@@ -0,0 +1,128 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/sphinx/sphinx-1.1.3-r7.ebuild,v 1.1 2013/05/23 00:31:17 floppym Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2,3_3} pypy{1_9,2_0} )
+
+inherit distutils-r1 eutils versionator
+
+MY_PN="Sphinx"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Python documentation generator"
+HOMEPAGE="http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos"
+IUSE="doc latex test"
+
+# Split the jinja dep to allow different slots to satisfy it
+RDEPEND=">=dev-python/docutils-0.7[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_5,3_1,3_2})]
+	>=dev-python/jinja-2.3[$(python_gen_usedep python{2_6,2_7,3_3} 'pypy*')]
+	>=dev-python/pygments-1.2[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	latex? (
+		dev-texlive/texlive-latexextra
+		app-text/dvipng
+	)"
+DEPEND="${DEPEND}
+	test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-python3.patch
+	"${FILESDIR}"/${P}-docutils-manpage.patch
+)
+
+python_compile() {
+	distutils-r1_python_compile
+
+	# Generate the grammar. It will be caught by install somehow.
+	# Note that the tests usually do it for us. However, I don't want
+	# to trust USE=test really running all the tests, especially
+	# with FEATURES=test-fail-continue.
+	cd "${BUILD_DIR}"/lib || die
+	"${PYTHON}" -m sphinx.pycode.__init__ \
+		|| die "Grammar generation failed."
+}
+
+python_compile_all() {
+	use doc && emake -C doc SPHINXBUILD="${PYTHON} -m sphinx.__init__" html
+}
+
+python_test() {
+	cp -r -l tests "${BUILD_DIR}"/ || die
+
+	if [[ ${EPYTHON} == python3* ]]; then
+		2to3 -w --no-diffs "${BUILD_DIR}"/tests || die
+	fi
+
+	nosetests -w "${BUILD_DIR}"/tests \
+		|| die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/_build/html/. )
+
+	distutils-r1_python_install_all
+}
+
+replacing_python_eclass() {
+	local pv
+	for pv in ${REPLACING_VERSIONS}; do
+		if ! version_is_at_least 1.1.3-r4 ${pv}; then
+			return 0
+		fi
+	done
+
+	return 1
+}
+
+pkg_preinst() {
+	if replacing_python_eclass; then
+		# the old python.eclass ebuild will want to remove our pickles...
+		backup_pickle() {
+			# array to enable filename expansion
+			local pickle_name=(
+				"${D}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle
+			)
+
+			local dest=${ROOT}${pickle_name[0]#${D}}.backup
+
+			eumask_push 022
+			mkdir -p "${dest%/*}" || die
+			eumask_pop
+
+			cp -p -v "${pickle_name[0]}" "${dest}" \
+				|| die "Unable to backup grammar pickle from overwriting"
+		}
+
+		python_foreach_impl backup_pickle
+	fi
+}
+
+pkg_postinst() {
+	if replacing_python_eclass; then
+		local warned
+
+		restore_pickle() {
+			local backup_name=(
+				"${ROOT}$(python_get_sitedir)"/sphinx/pycode/Grammar*.pickle.backup
+			)
+			local dest=${backup_name[0]%.backup}
+
+			mv -v "${backup_name[0]}" "${dest}" \
+				|| die "Unable to restore grammar pickle backup"
+		}
+
+		python_foreach_impl restore_pickle
+
+		[[ ${warned} ]] && ewarn "Please try rebuilding the package."
+	fi
+}
diff --git a/dev-python/xlrd/ChangeLog b/dev-python/xlrd/ChangeLog
index b94f171ea8e0..4b66ac30b086 100644
--- a/dev-python/xlrd/ChangeLog
+++ b/dev-python/xlrd/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-python/xlrd
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/ChangeLog,v 1.15 2013/05/22 10:32:32 djc Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/ChangeLog,v 1.16 2013/05/23 04:12:29 patrick Exp $
+
+*xlrd-0.9.2 (23 May 2013)
+
+  23 May 2013; Patrick Lauer  +xlrd-0.9.2.ebuild:
+  Bump
 
   22 May 2013; Dirkjan Ochtman  metadata.xml:
   xlrd is now maintained by the python team.
diff --git a/dev-python/xlrd/Manifest b/dev-python/xlrd/Manifest
index 9da42e190260..2c826fb21773 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,18 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST xlrd-0.7.7.tar.gz 132736 SHA256 e72fe62d339fc06418bba68783a5bd60eb8792663ad546cd04e5b5ece5f7ee0d SHA512 91b7e6acbf6985a6d2855b94398c02098f0825b3df39b587d499ee7fe57d72eda3a2d54af8ec5e42c6251d62ec9fcc0b8572d404976c9b39bf2c2dd67cadb9ab WHIRLPOOL a34af1d6daf1efe1f1cb5f3cc63ffae2dbf31cd9728f9f4e4e80b81548e8e173667e7f2adfa301d84d09a5fbd8be068161d23c5d83b203e7aa685e224abc55c9
 DIST xlrd-0.8.0.tar.gz 134716 SHA256 ba1b1823049a4a14d8e5ccd24ea11e2ef41f1101ec8bd4cce563b377cfe45366 SHA512 7b5b897ac940b4a5a86faca5a7d65442ca8410957ff18a302d6943199038b50ba52114bc356684bfb89d8eb050b14c746f304165f4a07f46964a978f050dcb8d WHIRLPOOL aa4329d5c89eabb8cae17e804ff80685f1b8ce4b234d797883bc6dd6b9353093cc39143295872dbaac225c0d66089ed643e82873f6f5c8caedb20c9c9c6d5fd0
 DIST xlrd-0.9.0.tar.gz 134993 SHA256 4772482dde38a1f81c027fda1ebcc00128772536273ddf2246c8fa1263be82b2 SHA512 6a768396462fade6fc9062473e49ac49e5e2cb5717473d2a5445c23bf41c69b833f8b5e911125a55059c877245614fa21660554a9989f3ea8acf2f8712515146 WHIRLPOOL 1fcfa3d471357d4d924547dfd72d3c7d02eb1f8886b6b3db0a7620865dc92b3d54a86d66ec8028562385f9fae0705e1018d6ca48586022b7eda80a9c3cb9a7f6
+DIST xlrd-0.9.2.tar.gz 167925 SHA256 3bc9823c09321ba62c6a6aa5c338a2c5b96c802717a044f42cec7a65a4c8e9f9 SHA512 876822957fd99f0e5791f7512d822589d4abd91ad203d3362b014f69b17b551530442e0df36167b3c2d443a20ee637c162f990f7abaabffd9b1924793cf18189 WHIRLPOOL e8ea7511e9f099b2cdd97041f02ed394ebf1e76a6cc30f361fa4da1dd385a198c5bb7d9999ae133e12e59a5de42e3ac85f5290b96fbc5fcc32ed5f07f5a324da
 EBUILD xlrd-0.7.7.ebuild 803 SHA256 683baa6a0b9c0b65904720f91dc002a14effb08e408f41198418baa66f22df43 SHA512 69a300b5ee38a608c490d0e864ddf9208953675ac40e662e186ccc4a3918720e45c7a058bc5c6b8f562eb7d2c350bba4405d314a7334300c738cd0d137d1aa5f WHIRLPOOL 89db8a7e34b58ff0806c151303b089161ddbdb98fcbaf8492a09e042dcaca2bbf029ef7d6b47d42cc97dd535dac9b72cbed9102eb6adf3898c30b53a8f6c64b2
 EBUILD xlrd-0.8.0.ebuild 809 SHA256 53aa05b889bc17440ea3635e2aa2adfd3ecd0fab441770cd2d46cc6e940747f9 SHA512 94002ccf29a03d607bc399ad242d411b3b7ee944a9fecd8c6ae71a73d0bfa41cc83bfa728323ec752a6d2afe1f811105732a4251d3ffa59cdf1f9f3948a2cce1 WHIRLPOOL 426e67ca5802cd431a30988e225c5035497eb780656d547bf383ec0795106e36d960d3d40d74ea07e15df624f935ee42ba59dd15e418792a3251aca21e98bf4a
 EBUILD xlrd-0.9.0.ebuild 1069 SHA256 42d80e71d6c475cdc2b5b04ff45f675e661a64347d526345f7a43d4da3dd367c SHA512 ff9c396c30491fc377e2cbd7cb7ce2f2629da2ef87b79859e6b0a6b73185a70867d6887460e9ec04982404a09c450202d86fb97bf71417ca554ff3cc1f44a22f WHIRLPOOL 566349402e1e9ecb908ad8ee2b55e07e671aaafc46218f561b2c6adaaf6f616d35baa6f4b9121f9c540b51423b1aee3a193438f03df2368458aeeb56eb9162e2
-MISC ChangeLog 1801 SHA256 2dabc52cdcc4fc3d00b08a2b806b51d1ce52baf1971ded901eb9cec0dacc46c4 SHA512 34df50c95e6c49757a6b00b33a52274617cb25a2c69891b0beeb7053a377bb1d41af244dd2ccaf0f4f68679d9463d9a77be518fab958c5200283f0817d962b1e WHIRLPOOL 21146048dd73b6b57b2845913e76841849f073d13a4e9abcb16ccb6aa6eba490bfd51fe9e36ffcd84037a4cd20a6e4e0a7e54d829044589742a21c5b1c2a91c1
+EBUILD xlrd-0.9.2.ebuild 1075 SHA256 8c16c2e7bf022fad9172d4197eff6520353a581d4ef39ea5d5df333718c63895 SHA512 ca45acf2bee1de87baaf4901ec62cd959d144dc0aefd5fc325a9cf7996b82acf0a37899a67138753eea9f763bafdc42f5ac17969de2b1f1bd8e95caadef6ebcc WHIRLPOOL 2ac8e1c2bca3873c68a6b44bc04b9afdab322fafa4cc2d628d798040c8b54fb8d93527df4ef88caa8f62a0036b585a0df9c809ec593ca5d2ff285335a705d430
+MISC ChangeLog 1910 SHA256 f423c8014a238f6ee36d781a1d2061147df42b4db111236f558eefe35bc15650 SHA512 7c27ce1d1c4a3f98953824fd31c6ca50e6cbfd9d00c8ea650e29456afbe897b6638ad6281471351596f891ad26742b952e52d930753593a455c442ef64c2620c WHIRLPOOL 0dc349c32f00d97314b25dec860e94b8bcedfac7cb84df6cf909727d2447ac0bcd9005b3ce4704ffdc5773fcd814cb4f3aab5a49cdb117f1a93e395bb5879bc4
 MISC metadata.xml 414 SHA256 a1cd12814af5fb2a41493ac54aebc5c8b7c8fdc831aab08a585ecc0482474a74 SHA512 26a509d15d629caab6f67967379412b0ce6c0fa71142c71ce9859c28fdcb680d76dda122a3750431e0da9260fc8a025112d3c2f69b649ff492a73f277709c5c2 WHIRLPOOL 982657a0da3f2c920375f6875ade80f14a565490dbe1a373c7081d2b64923fae833ab3635b49372adcbd2902a006a0bb42bcdb73a95ab2943e6d095d90101084
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iEYEAREIAAYFAlGcnxUACgkQxeMuLWsGW/tYLgCeK2T4P3Lk29Ib5fB3Wav41tnW
-1b4AnRWahIADMwCOH4v/GcB05QDuTP/g
-=kH5S
------END PGP SIGNATURE-----
diff --git a/dev-python/xlrd/xlrd-0.9.2.ebuild b/dev-python/xlrd/xlrd-0.9.2.ebuild
new file mode 100644
index 000000000000..070be012ff27
--- /dev/null
+++ b/dev-python/xlrd/xlrd-0.9.2.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/xlrd/xlrd-0.9.2.ebuild,v 1.1 2013/05/23 04:12:29 patrick Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python{2_5,2_6,2_7,3_1,3_2} pypy{1_9,2_0} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for developers to extract data from Microsoft Excel (tm) spreadsheet files"
+HOMEPAGE="http://pypi.python.org/pypi/xlrd"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris"
+IUSE="doc examples"
+
+DEPEND=""
+RDEPEND=""
+
+src_prepare() {
+	distutils-r1_src_prepare
+	# add shebang to runxlrd.py
+	sed -i -e '1i#!/usr/bin/encompdoc.html  xlrd.htmlv python' scripts/runxlrd.py || die
+}
+
+python_install_all() {
+	if use doc; then
+		dohtml ${PN}/doc/{compdoc.html,xlrd.html}
+	fi
+
+	if use examples; then
+		docompress -x usr/share/doc/${P}/examples/
+		insinto usr/share/doc/${P}/examples
+		doins ${PN}/examples/*
+	fi
+}
diff --git a/dev-ruby/amq-client/ChangeLog b/dev-ruby/amq-client/ChangeLog
index cb207265e8b8..ecd803329dda 100644
--- a/dev-ruby/amq-client/ChangeLog
+++ b/dev-ruby/amq-client/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/amq-client
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-client/ChangeLog,v 1.7 2013/04/27 07:06:35 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-client/ChangeLog,v 1.8 2013/05/23 04:49:53 graaff Exp $
+
+*amq-client-1.0.2 (23 May 2013)
+
+  23 May 2013; Hans de Graaff  +amq-client-1.0.2.ebuild:
+  Version bump.
 
 *amq-client-0.9.12 (27 Apr 2013)
 
diff --git a/dev-ruby/amq-client/Manifest b/dev-ruby/amq-client/Manifest
index bcd066f99714..3245bdcea6f7 100644
--- a/dev-ruby/amq-client/Manifest
+++ b/dev-ruby/amq-client/Manifest
@@ -3,14 +3,16 @@ Hash: SHA256
 
 DIST amq-client-0.9.10.gem 74240 SHA256 80b06050399d79745362622af133ccfbe2a3dffaf1c78e89cfc76755835d55f0 SHA512 b328ef504fecba86f7a0a4a887439ed2a135512bdf9718704b6b0f49e9fb948b7e481b9955f580c3016194026b403eafc9456cd77cc09d063516ceea2033af33 WHIRLPOOL 88297d2cd9ae05babe5d6104c7efd6a967f42bc743e7137483961ba4716b2aad77fde73c08d61477d22f330bb62dfb8d345bc369e2bd98fb31c0775978e099e2
 DIST amq-client-0.9.12.gem 75776 SHA256 7a593d9a621b9e08f1f7180c06070a034fcf47d4e575a19a87fbababbcca0e29 SHA512 3a5be26cd459638ed14dd2fadee1363d202997770b64ebb97318e9c780bc731e30c38256dc95557f0593c29dfcad58d51b5d0545932fcb7baba81902d8647e5e WHIRLPOOL d5c776417d5f5a65fbc6db6b7f709eed5a20ef20629b16b5a4ebcfdb2889e625737063f8698f4e024c3db6fa751e01a53ef29ffb0be8c7b27349a9b12aa783de
+DIST amq-client-1.0.2.gem 76288 SHA256 cb78fe80d15f6fde7631fe1dbea8bd7dcac596c791762a654bf67985040519de SHA512 2e82ed9cbf67ff4c2da8d2f37f461712b6432ff6d6a66bc0957094661912a09c3a89923daceab62c6261ed45f83c4779943b7befc68c69c73a3b3d3d7228cb4d WHIRLPOOL 561284b19a4eb9c467e4e38c440d8d7faab5771ea1b7e1820ba7c0ac74ee318f9911a9c48b33803b1559444c15eca15bc1dcdd31fbddff396e959c36ac239225
 EBUILD amq-client-0.9.10.ebuild 1068 SHA256 3bee0fba7129c91c6dc0ceaf573b79f67cd3b5c4ffe61eed5a934a60a8ef1180 SHA512 3b09c8dd1863b471a3db776de107944ca6f2185d4635290ad71b0a878d86cf6835631efbebc4edbe99f7a432c256e88fc0d72bf2d83a0580c75ba9ad18688394 WHIRLPOOL c611a2e922676bb7c9a46dc563cb1ff511b80bb8d807bbbcead5c712b091c9b703a421609bf26a20eddf33407a5106edc13d8f8273b61e992eeea5746d78aedd
 EBUILD amq-client-0.9.12.ebuild 1093 SHA256 157e69453dd29c33b531f2eb827734d613dec1c38e48f8695298394871e41d65 SHA512 f5a50a5f7af92036af717b864df6a13a7dea5b6c08136b762e0d6f709631ff3d148a6f95e1dd267be34414e094f3b7047a5e879c711788949cb93bd572da1323 WHIRLPOOL ec614911402cda5d38f067ffc8be5f1ad0883eeb44231ceaf7c3ca2516cf30c7dcd47881210958546cc782c2a6502c1d9ed66849f2f700b6f0abe1ad3a5224d8
-MISC ChangeLog 1165 SHA256 f2c3cccdb219b92799f93527f8550436f340b79a8e57f91d0b45eee8cc7bac9c SHA512 fea69aef625f380d18e8e77a554fdb42a1f5efc78b24206b576d17c26bf1364d1373385b0f28ca1c0ebfee23ff05233066e83270b70ed7604abcd25778b2730a WHIRLPOOL 9462c86ed30538ec90236e6066c2e1d47691c4a878234f605dba02f752b3be11facbee17870febb19f0850afa62d2f4f06ed9323348ceec0ebde258c3ce0041b
+EBUILD amq-client-1.0.2.ebuild 1092 SHA256 eb20ed17219cb25612cd91f11d449703caae10c7259cc549abbd0892ca2f221a SHA512 fae9adced6109afe9a96f79c2c564f70e3e33377485b39cd2831990a8f590a3547e722fef37d15dca16ebed3daf7a1fed54cd3a97da0d4339872dbf450acdb43 WHIRLPOOL 51b0b020f7d3d8a360c6ae8ba57e1c6160fb91a31c63a1e845be96c7e731bb7a6908baaadb0a850c5b7e4f90424fae2f80ec62e25961a7fad3efe1be39a3aab5
+MISC ChangeLog 1291 SHA256 019a8297a83f04d7aa5314958bc5a2e69b6899e7ea9e5d3cd9430718b3de905c SHA512 087e70d52e2038e38c419616e9bf849ec8dae890b961fa8ca69166f03cfba2d50de9e6c0c6ff027f795c1c423cb6fc0e1550ae8e2033a6618a110144bdd15079 WHIRLPOOL 0ca1b496248c43adb3a0aa432ed0358f48257ec341b85b0aab2e10b3924612cf4b88e8c4f267066fe314c62d7866963fb4140120a85c7f05589ca7c0d8ca4621
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlF7ePwACgkQiIP6VqMIqNf/8gD+Kfehu6sWpCLJojyzD2cHf2Kb
-8LmsCpINn6t+WSPGdV8A/03TakpSRufSE3UUhQC/BZHmvH4kgrLEoBZL6P6b+NY/
-=TxOf
+iF4EAREIAAYFAlGdn/IACgkQiIP6VqMIqNfSSQEAhEeyfYOPDzWwRFX+Qd7Q9+4T
+usggqOFwVsZketDpCKUA/iOxn1HgyzAFJtFwy7ckl21VfD+bym2/8dtnY4oYnbv5
+=w/q5
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/amq-client/amq-client-1.0.2.ebuild b/dev-ruby/amq-client/amq-client-1.0.2.ebuild
new file mode 100644
index 000000000000..ae5c2f7bf73c
--- /dev/null
+++ b/dev-ruby/amq-client/amq-client-1.0.2.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/dev-ruby/amq-client/amq-client-1.0.2.ebuild,v 1.1 2013/05/23 04:49:53 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 ree18"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.textile"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit versionator ruby-fakegem
+
+DESCRIPTION="A fully-featured, low-level AMQP 0.9.1 client."
+HOMEPAGE="http://github.com/ruby-amqp/amq-client"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+ruby_add_rdepend ">=dev-ruby/amq-protocol-1.2.0 dev-ruby/eventmachine"
+
+ruby_add_bdepend "test? ( dev-ruby/evented-spec )"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+	sed -i -e '7i require "evented-spec"' spec/spec_helper.rb || die
+
+	# Drop integration tests since these require a running AMQP server.
+	rm -rf spec/integration spec/regression/bad_frame_slicing_in_adapters_spec.rb spec/unit/client_spec.rb || die
+}
diff --git a/dev-ruby/amq-protocol/ChangeLog b/dev-ruby/amq-protocol/ChangeLog
index 841ad2aa7e5d..5eac2ff16b4e 100644
--- a/dev-ruby/amq-protocol/ChangeLog
+++ b/dev-ruby/amq-protocol/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-ruby/amq-protocol
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-protocol/ChangeLog,v 1.9 2013/04/27 11:22:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-protocol/ChangeLog,v 1.10 2013/05/23 04:45:58 graaff Exp $
+
+*amq-protocol-1.6.0 (23 May 2013)
+
+  23 May 2013; Hans de Graaff  +amq-protocol-1.6.0.ebuild:
+  Version bump.
 
 *amq-protocol-1.3.0 (27 Apr 2013)
 
diff --git a/dev-ruby/amq-protocol/Manifest b/dev-ruby/amq-protocol/Manifest
index ca1f9f7a831b..591cd8d5fa19 100644
--- a/dev-ruby/amq-protocol/Manifest
+++ b/dev-ruby/amq-protocol/Manifest
@@ -4,15 +4,17 @@ Hash: SHA256
 DIST amq-protocol-1.0.1.gem 42496 SHA256 64ddc0a4734e1cdead365a8456a717c2843f2bfcf4a9749cf8c666f34fc5440c SHA512 53c9a6354cdfc31fcc28ce3f41e3cc04ca800c0d0f68ececed51b65807fb5003339b813ba0e986ddb5f8fda4272138b592a54cb44f7dc474c930eaf4f7d897cc WHIRLPOOL 829727b7fb14d99c3441449d25575ea99c58510e26e6c09126614ccb501b235e9f4398280bf38b3eb3c303237697c3398e676cd60cd139811ea58b22d993db32
 DIST amq-protocol-1.2.0.gem 43008 SHA256 809bdf359ffa0306bd5cbbea019221ff458d0e2cf44b74b3f80ad1b79678574d SHA512 a125d45ff2edb93a121b54ebf6ee6f30006fb1a494176f633074fd0ef8b0ebe49ef5e375b25b2d54e3da0ba254cec4bd75db44ce8315f604fcd2959df44a7ca3 WHIRLPOOL 6141eef0531517d93dd6d436a6d7edc6201b93939e8425687984d251e078b19a356267e3cc6e72a07994b319d8b1c9da4331df1b5e856de256cf3ec2accf9f77
 DIST amq-protocol-1.3.0.gem 43008 SHA256 4ff737dd6db4e96933a5aa26d659d1b60209d43c45abe2f276d0be59a04f548b SHA512 8c52a1d76fde420546a55b4a670df118efc2d1f2f1e63028cb2f7ed3442eda8d127ee6f29f23e3ae560b507eb1a0c2773c1958e49f55595e8f497be9639cab5b WHIRLPOOL dc2441f7867e4ee9fd9da5172c7c5e7355737a2f413cae45d9caa87623fe70469088366d679a99662978d89f514a36a0aca8d5c4d99c1461426c8ac23e594bd9
+DIST amq-protocol-1.6.0.gem 41472 SHA256 05e2ab33c39588f04c96649fd4fb6c1c6295a7fabe18310db16e2555c93a4c7f SHA512 596b6d1f80c97584d4cb01a9f13547b963f9c59f99ff536d46c999775d738517ac35a9539e6db1970aad6a7e86606f4680be635b46f7cab61b4e3d92aec42f70 WHIRLPOOL 2b1691aaaaa451f30f9da122dc1f851edf8ed5be06b8cd6f6e4383e23f0899383090ce7fb05deed4a9fd9fe4522b6ac31f595bfa439286e864b90a6f50f01fef
 EBUILD amq-protocol-1.0.1.ebuild 668 SHA256 5ac1ceb969c08d55f29aea84496788895574cd6734047d6c89a705d792cb056c SHA512 21b81aab929bb98446db03d35ce3e473cf844165a28ceac35cd055284e53616535422ecc7866c473ed77e2617bdaeff2ec8afbb6cba1eb57872e2e771fec2abf WHIRLPOOL fd6a4b64ea2f624cd1d0cc639172adfa6f3b1d8a2ffd8f33d96b98ee4d9eebf6a50b81efa8dd049a929c430a6543f80a81f258ac4f84b4d3bd696d65dbe4f422
 EBUILD amq-protocol-1.2.0.ebuild 656 SHA256 018677dbb8823df06aed68ce1578f5fa0198ccbc7b78618b3e35d0eb571f4a73 SHA512 71efc4ac2fc8166e8d5a053313556a6f5353d26408f65bf2495b987bf955757d32aab763207f841a36e46f3bdb4508633173ecfcc0fa682e40ca420f8debf44a WHIRLPOOL 734ff383dfc0ebd84bcdb6cab60ecd6d36f81a2b3bfb547f91877f49dbf7bf7fb8162e689f67875b3efd312780358011c3650889d48a19d0d532813bad0d1303
 EBUILD amq-protocol-1.3.0.ebuild 681 SHA256 a55ba6a690e0223102442b1e50c6a505c45ab9a97aaf953ec31dc1c1352c25f3 SHA512 de5b36218245bb403cac52209f9058b2359a6d24aea0a20b475c94680c4c12116a304c854b3d1100b2fd3a5940520aed9ccced035e69d53a9b7fdc1f2fe02b02 WHIRLPOOL 53f7340643260bc7fde00b942d5032cea92aa0eaff21a70a9289d383bb0764131f0e9b51214d73e238dce73b6790c69e885e6d4b16fb7abec10b334f801c0a51
-MISC ChangeLog 1486 SHA256 b1780fbcd36c96cb4f76bb6dd0c3b0aa52153a6a4120f28cb24e90adef1d130a SHA512 2279c76c991764a3c90e52f10d885f5c81344835872efcf9be38e59be62f36f1185a59477a4cc38b312181faab019c3cd14a0c7c30ef43c26c3d7277d513daa0 WHIRLPOOL 8054fcc28c5ef0943e7c826f8f0fc7f0e1b01bac68987528eb575092fea71dedc61d2bacb77af911b0887e4241a6b9afbe2efe676c7a8b4a030a3ac85cefb85f
+EBUILD amq-protocol-1.6.0.ebuild 681 SHA256 9e88817928adf9b896e6185ce83f36eccd86555a6164f78a21a8e10c66f222db SHA512 f0287095065a6fbf90b51b5d1d235f92399d106a8f50d9fde841c466afccf2a6862e04176764ed3fb158fbd1ac4276f13da9fd55fe2bea883e7aac5103517958 WHIRLPOOL 653480703ed9794bb9ef7b9e9f0c43748ce9752a98c657e44d773ad288d6be2254c9f4f38d4499bebfbfafa64dfd6bdaca69655db0f8dacd396a6851c052860c
+MISC ChangeLog 1617 SHA256 8b13c858bee3ba3d4ca50fa36386fad63ce0723b338678965a18c7860417d379 SHA512 2ec1f525dc9d4de8d25c2c65719471b1548d6961578bf3da8cfddd56b62d96ba94714de974edf1f0e22d902604c293dce6e931cb1e31d84ea8d631b58f36bdf2 WHIRLPOOL c598ab26757f08cf824a7633d063025a1c629f3c105d376ae9402e792cb42bc9a1f90444407dd2f0261641c2e87d3fe1ce01ed4f85d2c366497bc4f7e7a6a5bb
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlF7tQcACgkQiIP6VqMIqNeBpQD/bAVbQvqd2VCWW2fMXobV9dcU
-H/vAbJPSeXI8MXN18nAA/0xH3bkB8+K93mKNyhFoMYFpfW0MryVYyal44DpRIawm
-=FYHg
+iF4EAREIAAYFAlGdnwcACgkQiIP6VqMIqNecVAD/TyBGh/2r/oSUFABJFpiylnge
+cULYt5ODTXpG5BMnvrEA/jccGStqsVWobLZE3L1WIwd620/xt7Cso6X9u7iG5yrT
+=0vFA
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/amq-protocol/amq-protocol-1.6.0.ebuild b/dev-ruby/amq-protocol/amq-protocol-1.6.0.ebuild
new file mode 100644
index 000000000000..be31b6bdcbae
--- /dev/null
+++ b/dev-ruby/amq-protocol/amq-protocol-1.6.0.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amq-protocol/amq-protocol-1.6.0.ebuild,v 1.1 2013/05/23 04:45:58 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby18 ruby19 jruby"
+
+RUBY_FAKEGEM_TASK_DOC=""
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="An AMQP 0.9.1 serialization library for Ruby."
+HOMEPAGE="http://github.com/ruby-amqp/amq-protocol"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+
+all_ruby_prepare() {
+	rm Gemfile || die
+	sed -i -e '/bundler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/amqp/ChangeLog b/dev-ruby/amqp/ChangeLog
index eaa0f307ef2b..284cd43d367a 100644
--- a/dev-ruby/amqp/ChangeLog
+++ b/dev-ruby/amqp/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ruby/amqp
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/ChangeLog,v 1.6 2012/10/18 07:04:47 graaff Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/ChangeLog,v 1.7 2013/05/23 04:38:09 graaff Exp $
+
+  23 May 2013; Hans de Graaff  -amqp-0.9.7.ebuild:
+  Cleanup.
 
 *amqp-0.9.8 (18 Oct 2012)
 
diff --git a/dev-ruby/amqp/Manifest b/dev-ruby/amqp/Manifest
index 248656706bdd..326989a48dcc 100644
--- a/dev-ruby/amqp/Manifest
+++ b/dev-ruby/amqp/Manifest
@@ -2,17 +2,15 @@
 Hash: SHA256
 
 DIST amqp-0.6.7.gem 83456 SHA256 7d7faf3e394d0a9c5c3574fbd87f9877b85dbd1fa419f5e1dfe84266f56cdfe3 SHA512 8dd993c5da6056b1904549aebe8c4807a014d82d22bb0b3be26f75cf09d9faa8c7bccc67fb06931bcb2b918ff12f12ee306a53329477d8af5a2a54652a9d0390 WHIRLPOOL e4f8372de915a94bdba801be691dcdd9cbe366a0bebf5fd0aab7bf8b7fbc34d1446cb6cb2b0d31aa66424649be558b676673212e9d46f5fe16da7c60434a8e21
-DIST amqp-0.9.7.gem 1167872 SHA256 7f7de46c59926f08bc380f7cee73ffeeb7df8355b036ff10671c9bddf2171c79 SHA512 570f150deae8d53d877766060d23c0417a638e2edd87b7be45bbb175171d5e5e5528557606dc1905bee3c212274e964667335a3ac33653e2635cafc42959eefd WHIRLPOOL d246aa6bba1e43c947c3952faf855220c0e6c5fa2ffcd69139e4bcb5681d036d0d72fa037426f9e6b7b2ebb7dcc0b38e88bf004029cf3de75c37f90624a8e3ca
 DIST amqp-0.9.8.gem 1167360 SHA256 a546c270ee7088ed229ee9ba403a0af4bf1139a1af41797bc3e5b97c5f17d6d8 SHA512 022ccc337e976d6888aeb149a1b665ae8bc99f8865dd0a74c804d6d7534507c4feefb67ebaacfb90f7be2605568332d2ae2a11728cccc5c94643fdd8a8b8fe30 WHIRLPOOL 96651515d1689929ffa755a8c5748478826f6d9658a19e210a285f75fbed896e3c172c98dacd332396c6c44a91ab3ffc04e608d258f71a9649f7c27cd7d4d401
 EBUILD amqp-0.6.7-r1.ebuild 715 SHA256 c74c277f2aec479e6d8bbe813ba384eb63f71c541045fdbee66b0575b6418c90 SHA512 2e6269c89eb96ecb2b28c4d609e7db7ba70c82845b5bc784ca48056923c33f89d5f8d602f3cc441f33b5d07b13f64dda8e559de408ebfe3d2f57d15a4ffcc54a WHIRLPOOL 315da393a79191b4ca5a3a2ed5334294730e85779d87b664764a97f8a82a0ccd200db5ce2d1ad336282f36d91cebac37ab68dccad4736ec901a638d518e83757
-EBUILD amqp-0.9.7.ebuild 1108 SHA256 2276bbca40a3b85ce92a1f7b6a5285e94bbe55503245297a6f842022151d7cd3 SHA512 a374f0024261b00661ad49a33fc3886849cbfd4649b1c241fa60ba343508eac30a491a376822454ffa4767dfc1eb44106d34264ddf95ae9212a1606729830947 WHIRLPOOL c37730d1b93000ba4d5d66a3c5203bea75733b736d0835652e0ae92b082abafa4e14cf5efd9723fb5baba589c6d562f41b0f672553568f75e4ed1364605b1357
 EBUILD amqp-0.9.8.ebuild 1108 SHA256 8a4eb7edaf35f620508f120463b85d1c9d2489d5f8dfbc2fdb73cd4071de65a0 SHA512 4422d31b390455ed468c66da684d6a0e85a4e6f7d741255a31c34d447b1d19f40eb09db06a0bd2ad8967d0dfc8227fe90a1ea90e83d43842a11c19b712011374 WHIRLPOOL c0888193a094cd2019d8aad806e28519065246460bd29713c02766ada6ac1f1d378f3963b52a7d47225dcdec5e7ceb5fd7303b2bfdb3313180863b0c8ffbc663
-MISC ChangeLog 1016 SHA256 d4ca44243695e045d6b268b6717b8ef55d8f06d35fbfb462cd9a64c28338c9a7 SHA512 6b0e5c634fd42a2b2c0c4e7201f9fa43c3fdc7bd4aeda80a5604bf2b751af183ca505ed424f8fe8c05f3c7fe5bed8050817782ecb632bb9bb7e5ad0fdf926ec7 WHIRLPOOL 45e4073245a966bde624b56601e52d37549c15544bb775fe7a7df070de1abeabf7a9f395b00229bffa1b4ef10846252be3867a17f034dcedea72c8f07e04a4cf
+MISC ChangeLog 1098 SHA256 8cb434db9d86828b56ed6aedbde3094937a1153c46c05c2883e13010ff05dab4 SHA512 ea23459801e11301cb8ff6ddcd3fca57408065051b483d9cb57e9f26bc9d9d23039b9aa7b0b0e9898b192c923a288e674c8943c50b0b667fb8b32bd2f31606be WHIRLPOOL d7fe0a41e2ae3cf5a51ca194ad370d9c859db089cc6256ca2770398d9d9e1ef33020d7e2748026a0caa42e59a7c41e33feff40aa701fe956c3e9e15be371220d
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlB/qhAACgkQiIP6VqMIqNd2VAD9F1XYGluIHo45l2vTwAs/CJ7r
-KxVWP+8mORerFCznLhsA/3/Ft3lJJrk5+ymBeaV9kFBeEwFQCaNotFcrzxxAVThp
-=7k8e
+iF4EAREIAAYFAlGdnTwACgkQiIP6VqMIqNc+XQD/QM0w5cEyaU31orllTEyiX1jh
+Wnf4iEy1Vi5jQIlfo9gA/j7TVWg5XsbaYCclrhx9Eddt40bLmr/O10uOgKiMwFQy
+=Idzq
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/amqp/amqp-0.9.7.ebuild b/dev-ruby/amqp/amqp-0.9.7.ebuild
deleted file mode 100644
index 5b29e3b23b31..000000000000
--- a/dev-ruby/amqp/amqp-0.9.7.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/amqp/amqp-0.9.7.ebuild,v 1.1 2012/07/29 07:04:05 graaff Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="CHANGELOG README.md"
-
-RUBY_FAKEGEM_RECIPE_TEST="rspec"
-
-inherit versionator ruby-fakegem
-
-DESCRIPTION="AMQP client implementation in Ruby/EventMachine"
-HOMEPAGE="http://amqp.rubyforge.org/"
-
-LICENSE="Ruby"
-SLOT="$(get_version_component_range 1-2)"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/multi_json dev-ruby/evented-spec )"
-ruby_add_rdepend ">=dev-ruby/eventmachine-0.12.4
-	>=dev-ruby/amq-client-0.9.4
-	>=dev-ruby/amq-protocol-0.9.4"
-
-all_ruby_prepare() {
-	rm Gemfile || die
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '/effin_utf8/ s:^:#:' spec/spec_helper.rb || die
-
-	# Many specs require a live rabbit server, but only root can start
-	# an instance. Skip these specs for now.
-	rm -rf spec/integration spec/unit/amqp/connection_spec.rb || die
-}
-
-all_ruby_install() {
-	dodoc -r docs examples
-}
diff --git a/dev-ruby/mocha/ChangeLog b/dev-ruby/mocha/ChangeLog
index 95d2ded0e436..8659cc62366d 100644
--- a/dev-ruby/mocha/ChangeLog
+++ b/dev-ruby/mocha/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-ruby/mocha
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/ChangeLog,v 1.78 2013/04/08 17:46:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/ChangeLog,v 1.80 2013/05/22 17:51:02 graaff Exp $
+
+  22 May 2013; Hans de Graaff  mocha-0.10.5.ebuild,
+  mocha-0.11.4.ebuild, mocha-0.12.7.ebuild, mocha-0.13.3.ebuild:
+  Move each version into its own slot since these versions are not API
+  compatible.
+
+  22 May 2013; Hans de Graaff  -mocha-0.13.0.ebuild,
+  -mocha-0.13.1.ebuild:
+  Cleanup.
 
 *mocha-0.13.3 (08 Apr 2013)
 
diff --git a/dev-ruby/mocha/Manifest b/dev-ruby/mocha/Manifest
index 19e02787f835..cdc287360d06 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -4,21 +4,17 @@ Hash: SHA256
 DIST mocha-0.10.5.gem 73728 SHA256 cb511ef036cf411a128175e0dca69081d97a58ec70beff5077f87d74eda6940a SHA512 147c1b91e6d30598f91bc2c9311b71dd37cd83b0c870dbe7ec1a45b014ccde9ee37c9fe38b6ab250d78af9c0c5629ff4a47a208ae3e8c206eba401c2b3ec871d WHIRLPOOL 65261aac8610029e0d826860a8faafcf920efb0f875393b650133794fdfa16c435ad837ced31d4e5cf0f93aa1d84359a799e153c6d927116787ffbbd94a32347
 DIST mocha-0.11.4.gem 75776 SHA256 12e901203211af113231d539c92390d456d2f0be37339917b5a35efbee6bb3cc SHA512 8a862f49e0dc7f2c98d499d0fd48d567b0d20580bba7f963d4643962e598dbda75135caf53a7fa04118f3faefb75c7627dec47b2f1330d1bd4bfecd9c78581ed WHIRLPOOL 656a49ef3812ffba75090fa76ca387ff960041fddaa7b4e66f89bf2f4bf2837d70a61424272ab5143736f81920cc18b7db77be4f74d21ff7f67629a919dc42c7
 DIST mocha-0.12.7.gem 76800 SHA256 a987ee463b4cbc42e08cac552c2094cd25614b9444e132082572343acdcd4cec SHA512 61f06a9ff0ccad4cfb63e15d5ae437296cb12e8606e4f7f759b05414226782109102ab5f32dc1ace6c6d72abf7029f7be628b4a0053bc3cea7e19a85e649a7af WHIRLPOOL 575b11282098580fbaac4b74de6e162d3784ba906841795604a959b9b2c39085627e91a93a2e95ef4e1fbb77085aecdc36a2faa4fcd3d867bee6aee089907830
-DIST mocha-0.13.0.gem 79360 SHA256 017df9bbdbe863bb3f6bfbfc586e2493744b07fae8040b610a4b9458509133b9 SHA512 149a3dfc24139795b5cffc3f9c158798691a9d9aee7f0a3c07d3c6e113afcea89d24e1d1705586974bc4b0a2cad208b71bfa0e436ee530380d52651f2dc4b8bc WHIRLPOOL e6e272fa5030b57ca13ea248b304381aa609a2e8e44148a752fc859a9495f632d4a9c1845116f12c6d99a64e5a1786e0e4934974ac3b457fa24908abdbbc9ba6
-DIST mocha-0.13.1.gem 79872 SHA256 3cc2f4f7d3ded7f105fa08645b8ae5fc48f1bfe0340e01936341ef37a5624ed1 SHA512 37ca7fe9076ab503b0bac4826b9ba3b982b50a1d980f6992143d3ab6ff29b35b0b149e8534ce3c2a1e70c7a78c93dc2f52bac37b1594642745972965c32d88a6 WHIRLPOOL 3a919fb5b79d3af1672369bffdfd07ac02c439a5a91ef1dcad557b514eef2ae409f29f7c513a176d967e4bb6bd64292657fe88043703da11df35497e47ee5d26
 DIST mocha-0.13.3.gem 82432 SHA256 4f979512dd32f2e0881c143132160dea433a392287df40d12576bbbb0af6646a SHA512 4c013565644d4b3af9bdc515c7b9b5be39c606c53d0b5da4569bd7c3fd98db3f2a7e6b88e566b32277c8e8d0ea6c83340e6afd1e80cdec0dfabd41e4fe5dbf27 WHIRLPOOL 150b9c0d573670b3592ef1f435778c2c5e47fe71f45dc59f99314b9042bfc146b46a5e42aedf899f8ea2e531ae7e5478d043a34f3d994c38d579ec0f1840e763
-EBUILD mocha-0.10.5.ebuild 1321 SHA256 52694d9cf4a95988fd3134a092e2dc6b608b81d1d5b8247ef3bbd114fc7f2413 SHA512 62aec1d9938d68bcdeb11fc770bc66c5621a55b5f828ad81a4b2475b52bf9603d2dce4921b6ca9ca2c70e39b9d89b59a173cfb50aa5c5451457ccd0ed4678682 WHIRLPOOL d4f77dab713ebfd8b790dc87d06b7913ce82311d1e6ecf39c9c5454bdc8197da34d580f78d9b5b2066924e9f1b41e43881f23424647e417a9c49933ab4a8ad71
-EBUILD mocha-0.11.4.ebuild 1289 SHA256 e4192e694adbc81f36c32f4e0b6097dd8ff644b7094c1ce41c0cc686583c97ff SHA512 ffc206db952ce80fd695f177cc9a22385f0f454f30e42aa39172ef7bec062a35322cca5f405371d5bff2226e2667fe593162aa29e84d323128f6ed22bf7aedeb WHIRLPOOL 1151162571ed6b1dffe903fa2845c160c46763b84c65b5382a04ea926385202ae91d0805c5854bd22d309ef01f6630235583f90754cbd9d4bed86d67c2aedf7b
-EBUILD mocha-0.12.7.ebuild 1316 SHA256 47fadd044bfbf75b7bcdf5627dcf065800f7221ac18ef0e065fc5108f06e933b SHA512 c537a974d3428abab243f58bd2b94b08b8a414de31211347b8ab8cbe5f4d372c55801a8c598116a88bf1a935f99f951e39839bee1d4aac4aba02b4030e1c036b WHIRLPOOL b72cbb8f734d45eabb2ce32bce072738985255ac88bc76a1f2b5b85bb842591752cff42e3e427d3ac8d3e33edb601695fa892e7f7b8a7fc43c2c55763f7d3e78
-EBUILD mocha-0.13.0.ebuild 1129 SHA256 2572b739d8bd36350d8a278132cf5a5515666fb0ffec4db8403c8559187b6751 SHA512 096a784ff0f976378421ccb47eb205865b600788036188359087bd26bf67e2c85a7f755680f41d3f474117bf51253bda7f39385cfd6a6230ad71f0263d55ec59 WHIRLPOOL b9dc542eafddc00b8bec556aeccd8e31ce4c23d0ad6432726bddec1bc781496292280d0ac41cc13d98be91a957542f7e0feb74342460f8ec17e10c8eb307d972
-EBUILD mocha-0.13.1.ebuild 1129 SHA256 372b5728878a1da9d2f59144a89f01fd9d5344bdcf1d792ec3825b3fa4b45340 SHA512 ce804d98cb45adc11985047b4f2ba6a1fda199c0e2eae68413c2798c140b006395fccb58d12dab4c8689605d706bb6a6919f7692d28036fa8b87af17b9593a00 WHIRLPOOL fdee4598d244d7caed76ccb33b03077c6497c192bf98652e52b49be70d1ed4133cdf438c5edee476413dc2f2bc468b36f85874e4fe9afba1a971bc5f826816c3
-EBUILD mocha-0.13.3.ebuild 1120 SHA256 611105e92e2fd444556fcac426c29a2dfb574960adc17182b0178ed19f5028bc SHA512 b32b43a8aa963fbddf9da0a8aa448032d03c1e80b0bb2f15f9020298ffb96d9b3af5ef6885fa94951e043db1d87b61471615172c2d150f8e7a4dcee923614ffd WHIRLPOOL 90f35f5b441d2f252f661a8f040f9bc240d2cde0795819f35009b22982600231359df6b0fa44fc762af6bd5dd5e0372bed5adf12bd01491ac015ee28accc0938
-MISC ChangeLog 10036 SHA256 982dc4e3cf8d9d441c27377c120b54d0c9162e50d49984461f762b3a0741494d SHA512 56fa44cd4a652a008d64a77bdba65619eaa5c22bf430bc709d501c0f8754d3d600b2014d15ad51700cb17434cfdeebfd154491f4e615325f0ceb818587c877b5 WHIRLPOOL 0598df2c0ee14b6cc9840756ba0d1972d1a50fd28b3dd8316e2a3cb58c86819ba9e9cc3c4c35d5362dac1a8afb0a278940ccf534b3b79197b0e0f21cc1d1e744
+EBUILD mocha-0.10.5.ebuild 1321 SHA256 7d59fdc44fbb5662d270e2b37cb4f536522ae82793a3728fc0cf7cdf8a3e601a SHA512 2f5698b993066f9e3a7666871a02210ab4178e11552cc2ee01dd445443203c1dde77ff326c15685ff63dccbea2eaa2e936cbb01314dce9c09c4cdf09af849a3f WHIRLPOOL fc79202ce89e4a2f3460bcf89a3c3b604e2f3cb5042a4a9f9a6d72d2621d2cfabf31719600a6443810ca354df73d607555734206b5f5d1e21be9e2075a54d726
+EBUILD mocha-0.11.4.ebuild 1289 SHA256 8d548f174bad74fdbf356e23279a90db62addabc59f019658d0a17c502e35737 SHA512 346918c6a8ec3d0758eba6ab5bbd7ca65779debbce790997ea25b1341d700c0170f3cfb384a7e3ca480414d7a1c808e9f5ed476a958e3ac0f8df45414fb00fae WHIRLPOOL a549cfbcd7604c4ac40274da45491668250724da18c2cf42b978819a4257b8b3377465322a65b0020184983f3e79389ed8d9cadaef494a5b10cca63cf4e78ab5
+EBUILD mocha-0.12.7.ebuild 1316 SHA256 c69d8e5a5a4b515fb28b88e2b5eb6fd9a56c5f74bf1bb346c6f11200b47ea200 SHA512 bc3a89cd4809b4681eb009d8b8480c6ad9bb413655bb8bc36149f3af66142b619468b9e0e9f2fe77ec8b01d8be3c916ad1f611bd673b93efa7f11c82243b29fa WHIRLPOOL 5cdee402a3b08caf437f1973a672660bed19facc487cb1009f115152423429b4a55cfa29be0c755adab959766b9111e1c899130c7eb8b4b8d392db4a133b05e9
+EBUILD mocha-0.13.3.ebuild 1123 SHA256 161c7ebf67ef89719d99ad2b5f4e0dbd832f80cf6ac1cd1c3b62a57c29c24157 SHA512 238655a9505514879e766178c48fc5e8a71326bea4968f02644bfc3737caa32aab028b9abf146602e0b9506db1cb3ef5345ddbeba300b089cd0708a926126b1a WHIRLPOOL e3201e126097f72651eb8507fa4461cbc69c907e5cfc6b11fc0675f8ecde93e6f2a9be8351b4cc8a283be06e74826716e250fa99191bf30cd5b1458b6383278b
+MISC ChangeLog 10366 SHA256 9c07fe423f8430306d729c8cb748f23553ff1e29f4944d448ce045bcc7f3566e SHA512 8fbe9d4ceb72b52bd62056aae5b1a33ec2039d1595a79854dbfa32fcf0a5bd0f3d88fd1223cddff30c50c06b00050497dbf2678f0f144d3ee290283c824f9800 WHIRLPOOL 59645b89897a716911e52b131df67d9d1b08413862b867171444b60f75f7553ccbf3d17b3686c9a13457472703d9b4985cf5d45b11daa775552a34491d337146
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFjAoEACgkQiIP6VqMIqNeVhAD/UUnbWbz0ySoOSVDv0wHDK83u
-sA4eWDUVnlTXVvceG+0A/2mCx7o7YVVoE9RH4d3uGT6BIqWNQqI+cCuD4id+KFfG
-=V452
+iF4EAREIAAYFAlGdBYgACgkQiIP6VqMIqNcIawD/eIwAhQXMtHEdC1z6Y4qfUXzP
+8NVhB0H4tUnJnRi0rVAA/2sZL1e7OQ9fehuWyfAQljrDHoZ/uE9HJC4u1unZz2r3
+=HPom
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/mocha/mocha-0.10.5.ebuild b/dev-ruby/mocha/mocha-0.10.5.ebuild
index a8e9ee3c194d..927c6516ffc8 100644
--- a/dev-ruby/mocha/mocha-0.10.5.ebuild
+++ b/dev-ruby/mocha/mocha-0.10.5.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-ruby/mocha/mocha-0.10.5.ebuild,v 1.13 2013/01/15 07:06:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.10.5.ebuild,v 1.14 2013/05/22 17:51:02 graaff Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -19,7 +19,7 @@ DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of
 HOMEPAGE="http://mocha.rubyforge.org/"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0.10"
 KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/dev-ruby/mocha/mocha-0.11.4.ebuild b/dev-ruby/mocha/mocha-0.11.4.ebuild
index 2289bcb34d34..c17cd4e8c64a 100644
--- a/dev-ruby/mocha/mocha-0.11.4.ebuild
+++ b/dev-ruby/mocha/mocha-0.11.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/dev-ruby/mocha/mocha-0.11.4.ebuild,v 1.6 2013/01/15 07:06:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.11.4.ebuild,v 1.7 2013/05/22 17:51:02 graaff Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -19,7 +19,7 @@ DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of
 HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0.11"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/dev-ruby/mocha/mocha-0.12.7.ebuild b/dev-ruby/mocha/mocha-0.12.7.ebuild
index 319e74dd2012..aac1d76ee3b6 100644
--- a/dev-ruby/mocha/mocha-0.12.7.ebuild
+++ b/dev-ruby/mocha/mocha-0.12.7.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-ruby/mocha/mocha-0.12.7.ebuild,v 1.3 2013/01/15 07:06:31 zerochaos Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.12.7.ebuild,v 1.4 2013/05/22 17:51:02 graaff Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ree18 ruby19 jruby"
@@ -19,7 +19,7 @@ DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of
 HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0.12"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/dev-ruby/mocha/mocha-0.13.0.ebuild b/dev-ruby/mocha/mocha-0.13.0.ebuild
deleted file mode 100644
index 0be37a79bb62..000000000000
--- a/dev-ruby/mocha/mocha-0.13.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.0.ebuild,v 1.2 2013/01/15 07:06:31 zerochaos Exp $
-
-EAPI=4
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC="yardoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock"
-HOMEPAGE="http://gofreerange.com/mocha/docs/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/unit/*
-}
diff --git a/dev-ruby/mocha/mocha-0.13.1.ebuild b/dev-ruby/mocha/mocha-0.13.1.ebuild
deleted file mode 100644
index a44da5a14a57..000000000000
--- a/dev-ruby/mocha/mocha-0.13.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.1.ebuild,v 1.2 2013/01/15 07:06:31 zerochaos Exp $
-
-EAPI=5
-USE_RUBY="ruby18 ree18 ruby19 jruby"
-
-RUBY_FAKEGEM_TASK_TEST="test:units"
-
-RUBY_FAKEGEM_TASK_DOC="yardoc"
-RUBY_FAKEGEM_DOCDIR="doc"
-RUBY_FAKEGEM_EXTRADOC="README.md RELEASE.md"
-
-RUBY_FAKEGEM_EXTRAINSTALL="init.rb"
-
-inherit ruby-fakegem
-
-DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock"
-HOMEPAGE="http://gofreerange.com/mocha/docs/"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE=""
-
-ruby_add_bdepend "
-	doc? ( dev-ruby/yard )
-	test? ( >=dev-ruby/test-unit-2.5.1-r1 )"
-
-ruby_add_rdepend "dev-ruby/metaclass" #metaclass ~> 0.0.1
-
-all_ruby_prepare() {
-	sed -i -e '/[Bb]undler/ s:^:#:' -e '1iload "lib/mocha/version.rb"' Rakefile || die
-}
-
-each_ruby_test() {
-	ruby-ng_testrb-2 test/unit/*
-}
diff --git a/dev-ruby/mocha/mocha-0.13.3.ebuild b/dev-ruby/mocha/mocha-0.13.3.ebuild
index 709a937acbc1..7d1b7a437e06 100644
--- a/dev-ruby/mocha/mocha-0.13.3.ebuild
+++ b/dev-ruby/mocha/mocha-0.13.3.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-ruby/mocha/mocha-0.13.3.ebuild,v 1.1 2013/04/08 17:46:40 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/mocha/mocha-0.13.3.ebuild,v 1.2 2013/05/22 17:51:02 graaff Exp $
 
 EAPI=5
 USE_RUBY="ruby18 ruby19 jruby"
@@ -19,7 +19,7 @@ DESCRIPTION="A Ruby library for mocking and stubbing using a syntax like that of
 HOMEPAGE="http://gofreerange.com/mocha/docs/"
 
 LICENSE="MIT"
-SLOT="0"
+SLOT="0.13"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
diff --git a/dev-ruby/transaction-simple/ChangeLog b/dev-ruby/transaction-simple/ChangeLog
index d4ddac60b0e6..7ff494a5cf5b 100644
--- a/dev-ruby/transaction-simple/ChangeLog
+++ b/dev-ruby/transaction-simple/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-ruby/transaction-simple
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/transaction-simple/ChangeLog,v 1.26 2013/05/21 18:16:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/transaction-simple/ChangeLog,v 1.27 2013/05/23 11:05:12 ago Exp $
+
+  23 May 2013; Agostino Sarubbo 
+  transaction-simple-1.4.0.2.ebuild:
+  Stable for amd64, wrt to bug #470898
 
   21 May 2013; Hans de Graaff 
   transaction-simple-1.4.0.2.ebuild:
diff --git a/dev-ruby/transaction-simple/Manifest b/dev-ruby/transaction-simple/Manifest
index 29f4f250b3b7..6fe0b60e5b8b 100644
--- a/dev-ruby/transaction-simple/Manifest
+++ b/dev-ruby/transaction-simple/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST transaction-simple-1.4.0.2.gem 17408 SHA256 87754b8b4ad9d2b7fe91b599f78e9122dc94837d3abd98e227bb6f82b4a8ad59 SHA512 083c2c0d8c094d052a5262e21911985a3bf91875892844fb0559546901eea21ef14b139d7af6446c7a7bfbd1adf177e2d73cba2798c823bf295a6c87981165a4 WHIRLPOOL 8e9dbf6c03fbf9fb8ddf1f0ec15ba8b479a1047c55c3b7e6bd942f83c34b80c3eae6d5a876c009e0ea76560b756442d89678fb5eb3f296abc35d4def56a84d22
 DIST transaction-simple-1.4.0.gem 25600 SHA256 facefbf06eeff5adddbfa9c15c98d757985a93bdea830136a52a27d167188eca SHA512 add0475b8d643ff1111646a5e112778ea0a8ae46ca6d129ffe68d3b447107b2246e3a47390819ed98f57752f1382337589a015338bb1c28e26d59a5439b2c3c3 WHIRLPOOL a8d694badfb407881397e93c744c5eef3a488207c8e1d8b3477dc97034f5fcd234b7566d1b4478cfd11ebe10030528dd24ccaa5940d6df6db4d1e1996f09adee
 EBUILD transaction-simple-1.4.0-r1.ebuild 638 SHA256 ab98101cf33ce1d5a45fb5ea1a1c6249b0055968b01e2020a7344f4c1585f1c0 SHA512 2702b9877d386c0a79fd04d19d4e25799a541c2f5502da744718c440a37d7d18593feabde8d8b2376a2107cda4b4360f29ae71525d3f2408cf06c2a59057a420 WHIRLPOOL 8e62e098e1e681d61e600a31206735d3cada5ed62c388115ed1b5fc9030e79995970cd838b63811aded7ec1072ca82e5577ba1ae1b48c472e280117d9dfb0af0
-EBUILD transaction-simple-1.4.0.2.ebuild 771 SHA256 a3fb27dd41c6833560d6511a9649efdd7e4547fdf8fe53c14278cd9b04deb670 SHA512 a94959edc3f98d47882bbcca19971c2aa58fce374ae9226518ed818de9d6fc694422360fa45a9f8507f3f74f4d4c046d7302bc4776e53d34183dae2e5889b98f WHIRLPOOL 342abaf71a6c2f8128eaf73167244d6c8bac8766762735c033d4e3ca4a3f3345002db359549e65080b9fe21d18779c15121ba97d941b03588a1659a5c4a42679
-MISC ChangeLog 3837 SHA256 bbae4933c6c0b7e5e394b0bf73b281c69a942d80a8e2e25ded06802af383f5fd SHA512 7d04a2bc6610b2d23dcdaeeb92bda8b161d9983592e1e9b6d24f7977343a600ea8587981ee4b737ace589f93d6bdc7f6be1d77d5d3d7002012107ab3daea43fd WHIRLPOOL f709f8e266556cf8c8d2af09ba4023f2882f2493ad15fb362f4245a5c5f9b44c0727d9219c750b51f0bebe7f8f1721b1a629ecd47b0cc69098fa7038003be09a
+EBUILD transaction-simple-1.4.0.2.ebuild 767 SHA256 26eb38f0ad8074b0cb8a395e90c484d444b45e6fa2b5f16c426667f25b8a811e SHA512 4019d4c2519547eee5caf7a7265cd72881279c54bdeb192afd13f411b6ebb00b3728257406525cc61297f17e65e1d8c62d3df34d550ff81147338436bb1cebdc WHIRLPOOL c89fd31734f09b0d4a29864115c1e6665ea6f91427616b38ac6c7d582c4374d3add9a7908ddb0bf3e63a1ddc336b95d9507257b172ec0be4638f6741b1a4b0bd
+MISC ChangeLog 3960 SHA256 239f1dff2bb9ca9ff2359aea2dd6851a503ab5c5215ca5a68369d1812886654e SHA512 86c02af18512b5513626c638bd0e9db23412bb7ba73dede9812a7725ea1f59a3dc9cf43b305e22255a5a88e91110d26278b4c716a6849a8911ab3b043b84a347 WHIRLPOOL fb9446d16bb8a56d4e494c2a7a3f9c0a2ba77b410cab3949af6ab486c969c2eb87ff3d41490f176d1a2536b7aa230c22288448427ffb46f174e8626573deb282
 MISC metadata.xml 157 SHA256 11fba03a217e2d996f5cd8895493a5692ece8ddac2c1a2dfc71d0e830555121c SHA512 0cec73b966de88015ea4c7212723d848d367608aa93658bb945f298a8000c4ba8aba73c9eb8481859fb5bbed45e80dae32c628caf81e027a4ad8eafa7e632851 WHIRLPOOL 4da25c81e21173ad8b7b5f35b056264869d9a16741062aa4422c5ea1aa9e73da8eb700b0d54de84c169d702fbb3f41ed157c9dc7c9daac110849ae84715c051b
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGbug0ACgkQiIP6VqMIqNe+nQD9FnRZnjxob/ShEz6h4WsD6Voi
-13xiHeW4Y97R/xGgkG0A/2Q6XQSahj1syj63YE3iVyFtXH1461VlhF5ev3mQ9W9k
-=3nia
+iQIcBAEBCgAGBQJRnffmAAoJELp701BxlEWfbsUP/j2pYmy6BgUmC6XxAEJA+ggT
+qE2UJuRMnsC1KjjqJ0smDJuqjFRJaZNOj2CBJ7/L3rpu3WXxQP7PNmYZzgSIwNb+
+NfP4mB9g1sKXV1IvoJC9+ifzeX1bG+Ahv1KvthttrJ/gneu+4K/MOi8LoeZOMni4
+VvCr54hsEzczpwDhP5Puv6p9e0Lkbai7RKH+4jbG+jIyUhy8WCrPqqBKQVeIbdz1
+ZlJQw9LdXjLYcRv6M5zdSRv8eaOXvURT2hjLZQE0yR+20RjuvNKdvg8i2jMRV30H
+82sqtHeHaKH3zb/3FlQbfk9rsP28i8ZipXb4t/f2uy9iQqXf8XkcwpHmvwY6eSI2
+3YqVIOtS67B0iCK6rGbww4yOGAZw0KBiGrqpBgN8m/6isKk0WUQnJ6qlAA06nagT
+ETfRx4kaCMPNX/47mF2p/4/3M6OuZ5W8wVlKd+Y7veUf1ajLuuKWDfNaGADqYik0
+H50XMiuCKk8mK2Ld8coI3uz4heh98HFvjlQ/ojnqOcLPKnGAQLjsbEUCIgXrpEaR
+V4ojgbpXVwXQbOOEMwVL0AXULNZBAaGFzHK2F7ZPAflh4Sfrw5dDJ1ESc991DxgF
+GuEZyHKRIL4Tji0CJ1gOGTbBm23pfApoNBS5OejJdgfsqBkKwyuh+hJDlSpp11/D
+ftmh42KZsv1aMQP4mK83
+=JUQR
 -----END PGP SIGNATURE-----
diff --git a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2.ebuild b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2.ebuild
index d74063989a00..34b9e2d0a023 100644
--- a/dev-ruby/transaction-simple/transaction-simple-1.4.0.2.ebuild
+++ b/dev-ruby/transaction-simple/transaction-simple-1.4.0.2.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-ruby/transaction-simple/transaction-simple-1.4.0.2.ebuild,v 1.3 2013/05/21 18:16:37 graaff Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/transaction-simple/transaction-simple-1.4.0.2.ebuild,v 1.4 2013/05/23 11:05:12 ago Exp $
 
 EAPI=4
 USE_RUBY="ruby18 ruby19"
@@ -18,7 +18,7 @@ HOMEPAGE="http://rubyforge.org/projects/trans-simple/"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE=""
 
 ruby_add_bdepend "
diff --git a/dev-util/debootstrap/ChangeLog b/dev-util/debootstrap/ChangeLog
index 6c9c8c634c1b..513a0b1a4c93 100644
--- a/dev-util/debootstrap/ChangeLog
+++ b/dev-util/debootstrap/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-util/debootstrap
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/ChangeLog,v 1.219 2013/05/19 16:54:42 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/ChangeLog,v 1.220 2013/05/23 03:18:33 jer Exp $
+
+*debootstrap-1.0.52 (23 May 2013)
+
+  23 May 2013; Jeroen Roovers  +debootstrap-1.0.52.ebuild:
+  Version bump.
 
 *debootstrap-1.0.51 (19 May 2013)
 
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 4bc9bf82c22c..779054485d1a 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -7,6 +7,7 @@ DIST debootstrap_1.0.48.tar.gz 58167 SHA256 c55f2bb6a8f9483a28273ebd73e976276e8f
 DIST debootstrap_1.0.49.tar.gz 56785 SHA256 5018df1793eda465d1db72e89b117fd7051915f0df86a65ed6b408d82a0e1443 SHA512 3ccdf3e6294557599db40909510c7a5f9e503a3ffe5aa20232375866e5eedd493a6538ab05345eaeddb75f3c569b12c3a9b66785acedd090998df495bfd6ae30 WHIRLPOOL 93cfdb16871e4b420819b2f3171ddd2bba22020d6b40da030492d080dacb4932e772105dd76b8554f776a78e9f40a50eb370339302a0d95d19ffaa8231995c85
 DIST debootstrap_1.0.50.tar.gz 58304 SHA256 94cd272ef975ce3fb933a822746876330b7e795f8077996ddc4a3604711f664d SHA512 7b3bdffb63eaf727785eb7ccf247ac149d5e875f2703fe1c6cb883222c34bd8a4e99e0e4cd140c11e14f7ace8da9b91f8adb4100e2159e5b987f3e18433c3f70 WHIRLPOOL 27ae892ce2203bf14307eb72007e7c70ecaaf6ab7482e9af214ddc6da9f553267f664b591829aa127aa6db77bdf48003f48903d8e964af61a626872bb6a69e8e
 DIST debootstrap_1.0.51.tar.gz 56910 SHA256 f07ff01a3a3868000a562a08471641f2d5eca30f5813bb08e1b68d2af58ed799 SHA512 3d056a8c7754e6becf5c836c0c245db0ed03e6850dd72fab515b87f1167b29cd05b798f3798b0212611257515457e116aa7bd5e8af092fdde637091287f16b28 WHIRLPOOL a00098facce27561e4cb50fb40784dc71f94f2d7e8cc76a668100142de8c1e17a1bb4bcf7f14c3e5a48f9e3913b63c019257aa7ca08413d820b1a2e3dd998db9
+DIST debootstrap_1.0.52.tar.gz 57505 SHA256 0b7ad9c887de826a4561ff552069a8663b38e2cf4c91182a37682d737bff39f9 SHA512 fe0b3f30c8093d303d768d411475ec01936a02e4e52d863695ffe06daf7de962a2703cb4536e45e9fe8d33020239e95f388554be6385a4dcdead25cd0fe803f6 WHIRLPOOL 437be4c7c687ec236bf494c634cf9a0ba5f29052aab1ce49ecca4972d6db022931efa9556224400b2a56e664eb9b8408405a2a2dc8fbb3466cee90bf004b9bf4
 DIST devices.tar.gz 47835 SHA256 0d93f93c8b21160069d14e74f8f990a2e0e1e5a90dc828b29e6b3f5aa5829e48 SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432 WHIRLPOOL 222963bb920e1311bc2f481bba04e49f386b60cce6ce0576424896277e0c4fc6a339d4403d587744c32b0bfb1db6391f200fa8d66117e3f21e1c12f35365d732
 EBUILD debootstrap-1.0.46.ebuild 918 SHA256 8309cc0c3b90359d336d19fbaf548b013ef085813ca1ccbdfac447477d3c1523 SHA512 0419c24787e68d20d6699cac3e668b9e1205cc0fd758fed37f928a41a3f0d5043dd5fd8a45fa55b88a7a7f529e52424d51b6a46bc48880073e35a8b2d887a072 WHIRLPOOL e16a834b44d33e10bcd2a9e6013aab15e9479010a0cbfa8ee2379e31d344e830607ba2ff37e112e51094cdd7f17c962329e97663643fca7b904f21db322f0caa
 EBUILD debootstrap-1.0.47.ebuild 1007 SHA256 862d2cc4b6a1bbd87d6cfb01b200a781ad87ea38e5b505a2db285eab89ae2b88 SHA512 716fe8403510c3ad083ec0a0aaaeb3991f14c13ab0dae528101631d07af6f0dae56aa1da952cbfeb1f3f91f39a4d18f7e2ef0ecee962e1d32f73d70214ba5e36 WHIRLPOOL a7c77ca49419ffadce221bc12bfe5a34edaaeb35afba34fcf85afc43688a902e0d2775ba8b0d55baf2480fd784d1d1fe83e14eb0c93841b79fa5a83d5b65d390
@@ -14,12 +15,13 @@ EBUILD debootstrap-1.0.48.ebuild 1007 SHA256 78b7d90be12afebd8ca11a93fb7636e4c6f
 EBUILD debootstrap-1.0.49.ebuild 1028 SHA256 6c634cbb61fef2952545c93521385211ad754a824bfa80c4878ba16be538e00c SHA512 a4056617a449e5884fdca2bd5351d9c4cfea6000f1f68c002d389a36f39d5d1b66e50a1f4d7c0d40f17bc8860211872024feb1edceed036c57cc44ab0df43955 WHIRLPOOL 0c2390f4049b8e3f57014611b7d1c55ad4b3f89a5adf4ed60e12028749f04f90460d919665916c6ec5aaefbdfe0c99596c7ad6d47dbd17c2f2375255aab3a390
 EBUILD debootstrap-1.0.50.ebuild 1007 SHA256 ead98498aa57194a64ade8726e53cdf55ff62f941b4c562e1aa8ee23f6df4f22 SHA512 6a099ac04b93dd654a8a90a2b134f04ff9f167ae7558d29ac5616fdce7f18c1d41baced25fbed8bb142adb85bb717dc8d4b093d6127b6f0204ff8f2e6c1c05cf WHIRLPOOL 8de5e3e1ba7a78c1df6eacb3d507dc62e9e1ed36e0d1613c621d60de200c705916a8111a2993c2bdbab4a874c76f5cad5390a40a4ad6321645f61a51565fcdbb
 EBUILD debootstrap-1.0.51.ebuild 1007 SHA256 56f608e925c9de6f8e768e12eeee7bbef2438d7daaa2e37304d5bc990037ba4f SHA512 e7b7d595978d813546fd3caaa17f4c13297c6111611ecf683373473d62e45576ec54138685abb9d594a84a19320ca7a7105b00d5f59d325ea278fd7c39f263cb WHIRLPOOL e0d8174cac21cc377158efa6e4536e287bd79325fbc22b2a9a195aabae0ab8750e07d4c5b43f1daee6100692309f51a288805300b9200f887662b8a7958097c4
-MISC ChangeLog 27557 SHA256 7d5b8018964882c56ef810bbb845c6d950df5f80d3be41ada72930f45b90c4c0 SHA512 714c21c66617a4963f4df4ba430b8be442a9f51fc04d7c2b3823a945c066ab731aac6edf2ba6d209031c95b1049344c3a3042e04e980c678ed35e208a5af7210 WHIRLPOOL e9c862e9af5e5600eddd42240a553ac44bf49cffd6ef6862ba5aa0ab3fe7d8ae5a22249e7184aef5da533fe7a4630a9f5e0f3c8ea0466b27c16981741582d946
+EBUILD debootstrap-1.0.52.ebuild 1007 SHA256 a5fd3a309078cb2f3ee7d1be4758986b592731f3ebee1029ee4caa32b649b901 SHA512 0785952ca80961016804ae7d50b5e5c934f57d2f15ddbc75485ff6f671ead15708782bb95269ed0dfc0f1d0f15121debde2c9ffb7bc39bcd33f1a961245e757b WHIRLPOOL e4b16e5e418aeb2e5d8bbfb38194920ce843ce81b4e40a000e3665c736d207bfe9fb9b9a0fff938d8ecb4f3d1132d82ceeaf68f55e218a7f64eb4cf2d5a3598d
+MISC ChangeLog 27684 SHA256 fd099f2bd5c3d6cec59990c4c5d0190da30888219056ff3da1d42fc03fa618f7 SHA512 8f1a7ccb82e25baef4cd71cf57f21667463cb3d3e3aacca43c1d537a32b14367cf9ba12bb9c2992587d123e2c3551e83a78f0fdc2d121eaed684c871a2771778 WHIRLPOOL b06173e06b933aaa1ddb1281795bfaf2bbd03503f9f68b14fd1daaf449ee0bd1c1dd4a93ed60ea51f4c846beee45f9418c91656a15ec3e661a93284e9c07ab49
 MISC metadata.xml 254 SHA256 2790aaa1752a64752fb0a90f28f292669aa359e1c1583ad3834746b55e86dbd2 SHA512 b8d3d7e0aaa35ea183b5b2978ed73ddaea52efe0f14ac2f45cbd64fd7d7a49383330ab3bf5f9777681df053584d5f392b6b6c22dbd778abfe39b8e0cc5915220 WHIRLPOOL 3403ae3dad61712af8ca7359fcb2124a509796fcc6a71d5a6c34cbc80ddcbdde48eddc03bbc559250b9bb818d2464b36143d17d98f21c6eacec34b6bda1ba048
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGZA9MACgkQVWmRsqeSphN4XwCdHIHYV9rgdYQDvIIXvGjVS+qM
-hwkAnRSvMFqn5P6IB+uCYFdQlMv3CCys
-=MVDZ
+iEYEAREIAAYFAlGdiosACgkQVWmRsqeSphPcGwCdFBK8EUgu/vbe6W+FeEURQaXf
+Xb8AniU13hnAMBp7L9QSaMhIgeh2VeA3
+=TV08
 -----END PGP SIGNATURE-----
diff --git a/dev-util/debootstrap/debootstrap-1.0.52.ebuild b/dev-util/debootstrap/debootstrap-1.0.52.ebuild
new file mode 100644
index 000000000000..ff8637afb633
--- /dev/null
+++ b/dev-util/debootstrap/debootstrap-1.0.52.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-util/debootstrap/debootstrap-1.0.52.ebuild,v 1.1 2013/05/23 03:18:33 jer Exp $
+
+EAPI=5
+inherit eutils
+
+DESCRIPTION="Debian/Ubuntu bootstrap scripts"
+HOMEPAGE="http://packages.qa.debian.org/d/debootstrap.html"
+SRC_URI="mirror://debian/pool/main/d/${PN}/${PN}_${PV}.tar.gz
+	mirror://gentoo/devices.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE=""
+
+RDEPEND="
+	app-arch/dpkg
+	net-misc/wget
+	sys-devel/binutils
+"
+
+DOCS=( TODO debian/changelog )
+
+src_unpack() {
+	unpack ${PN}_${PV}.tar.gz
+	cp "${DISTDIR}"/devices.tar.gz "${S}"
+}
+
+src_compile() {
+	return
+}
+
+src_install() {
+	default
+	doman debootstrap.8
+}
+
+pkg_postinst() {
+	if ! has_version ${CATEGORY}/${PN} && ! has_version app-crypt/gnupg; then
+		elog "To check Release files against a keyring"
+		elog " (--keyring=K), please install app-crypt/gnupg."
+	fi
+}
diff --git a/dev-util/eric/ChangeLog b/dev-util/eric/ChangeLog
index 236c05faef1d..c7875ff06565 100644
--- a/dev-util/eric/ChangeLog
+++ b/dev-util/eric/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-util/eric
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.196 2013/05/22 09:49:18 patrick Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/ChangeLog,v 1.197 2013/05/23 11:35:56 ago Exp $
+
+  23 May 2013; Agostino Sarubbo  eric-4.5.10.ebuild,
+  eric-5.3.2.ebuild:
+  Stable for amd64, wrt bug #470488
 
 *eric-5.3.3 (22 May 2013)
 
diff --git a/dev-util/eric/Manifest b/dev-util/eric/Manifest
index 53bb9060bb68..731dd30feea2 100644
--- a/dev-util/eric/Manifest
+++ b/dev-util/eric/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA512
+
 AUX eric-4.4-no-interactive.patch 600 SHA256 ae818575da55ea4074fc8d1ac846f5ce338135b543b927c748bd94c8860325b5 SHA512 03a4f0550d03c3ea3d628e9edeb58e99313c5509b2bdc9e403491ebfa09eed261c34348f97b53032a159340822ff9cbf783323f4037be9eefff6212593f5a4d5 WHIRLPOOL 60fe197b737cba61f2682ba3db98b219f8f1e8eb08d89e890c2682670985455e5598052e1311e7e7adf4e5dfa6b33c3260356d3a11036308d976462a3614b279
 AUX eric-4.4-no-pykde.patch 4499 SHA256 371c080e2f561ece22f4e6a0ff427efdf43b0d3d81cefc2b7efb99010f890dde SHA512 f96e9a2fa528fb9e01af738c72a48aa329633411e160877dd8185ff3245a5a0f8cb7e586f5aa2d19bc174a6124b02b275585737b6fa0f8efbd1094642652470d WHIRLPOOL b1cd5d1674c2c51af04ef157ed9c34a19a974fd4799e00ef88fb443bd7847cd277ab7ae11ca4b91e476119d7e21bdb8572f5987643c53e7a0920b5b064ddbe5f
 AUX eric-4.5-no-interactive.patch 532 SHA256 c0978b5c15f39d3157065d76b38e9b2d12c23eb13ec887104413e7acbbbcf581 SHA512 64d4d7f96cd3f69d5dd3ebca3b13def2d27358dcb08c9d51e983aaa879ad276ea7130fbfe13cd74823f2dc97af717e94455b1c852675f61e1a615faa4de1bb48 WHIRLPOOL c0f52797de85b8877de1af39d884c9b7aca775f3d58cced50e6b67127595021e4b1dba5abc836132b719676a3d7861c7cb8036951e4a35d0fe5466a701f7206d
@@ -51,10 +54,27 @@ DIST eric5-i18n-tr-5.3.3.tar.gz 480349 SHA256 bc012cdb22b088ba1e30e9b12cc62e09bd
 DIST eric5-i18n-zh_CN.GB2312-5.2.7.tar.gz 436691 SHA256 a61b3737c5a4621b3f65bdbe4713cf519b93625fe3dc225d1088a76869580d39 SHA512 9f655b960e69d7e8ac7857661ee88ff256451aa2682bf7cb9064e2f570c0211527e0f8afd697b37e7a99512faaa435dff7dc9e97e762ca3d5ef256ad13c760f2 WHIRLPOOL 5d40cc5d836a936b3c84ea66ff1269c99be0111a2ce774717e4f4c5c1c0f35099bc555d868a36e64cdc3e1643b1f3300c2aa7d5936e37e9d00ba70352a72b315
 DIST eric5-i18n-zh_CN.GB2312-5.3.2.tar.gz 464843 SHA256 f522e57070375cc1842f0e4d64a9f9e42538544ae62bbd856bf19c9e5353a498 SHA512 be359bf4ae00bd27de37552c8ddd817229de2b5c9c7c1853c23b14a6af971e197abee63f980693bbcff15e024f1ff934465e6b2465682ad48c32840c54ee6e3e WHIRLPOOL b8f172d02e8a41c36a606de34519dc81e933c28932d311554335fb6ba3935597f2fe385e6264b9dd76b0b930c6da2204e5371ff4e4069e4c659cc39853228c31
 DIST eric5-i18n-zh_CN.GB2312-5.3.3.tar.gz 464840 SHA256 592fe358c36bff254969ccc54b9845e983f7c387750649b19637b77a34206fa8 SHA512 55c2aaa98a31cb0f9b30ce3f8b82a3a458db6f673a60daa74e2d289e74cc85ce75bc9672571c21cbb9f5819fb4bdbc37d4e6b8ce0f91d758ca4d87e9af9fef5e WHIRLPOOL 5974b8b8e2433c940f1f8fba92343a61ca5f6cf84033910992717c88959868bb2465dbba3c49c827a84936684056325fa00fecc305ef1c6d82913b9b660655be
-EBUILD eric-4.5.10.ebuild 2857 SHA256 2dbb77ea13ce5afbedde343ec06b18d98f6dc329843028efeb6e621d559c349f SHA512 0445718a7ba7999e991ac17685c2be7b5007d963cc7bcb95d3f7e2fa487766013be016a7aff30870666858eae46ba733b5d6b24bce381d3433ff5f36db441014 WHIRLPOOL 10ffe64908534947cb368dc70d8434ace99ae6741b601ec19d340a163e16e242380e8cb1ab6c8938ac7a8901550a199a118aa5aa8e342837cd62644f8d4bf9e8
+EBUILD eric-4.5.10.ebuild 2849 SHA256 0391bd8b5879f88899a90980c66475db8a490c1b8f02eec8c79ed45ad4baf506 SHA512 df5424074420dadd1a5efd988fdf034eff779c602d5ea8e2bde73f0323092b61f546ac420e310c643c751a3e152cc0864eff85b1c5fdf57a607bda072a2eb5ec WHIRLPOOL 0a2654ae9cf6a9edf1cbd302481157888ca3d862cc6513e71a8169931d0e13ca84c30fdaf0dc16167d538120e5fe725ab590814f1c3586d5bdf964fc9060ac40
 EBUILD eric-4.5.8.ebuild 2847 SHA256 ebf88d795cdb8a5d6896df6a4b3a02e0ecf3f8774c74eef90121d8b25f28a12f SHA512 5e638f8010ba4cbb14d4624ce5a7a5cc8842ff06e23404fed2959dabd0c48b3d1b47923e7fe7c4406977debbadb37a49a82c069bda0eb7af1c379c90b5f6cc34 WHIRLPOOL 85701fbd85f870511ad073d02648cae0296bd7407a0442812f2df0b2a1fb01af5308221388f535201f55743e5c8d5f6c75d2b993fd72670a3021fb2d419ec453
 EBUILD eric-5.2.7.ebuild 2946 SHA256 62bc31850451dd5f1aa2a475912af14ef4bf1e700ca95d656c1ece60ccaa4417 SHA512 43c9893727e9f57984ea40b6edc87bb6e8aa9681da619e68653e6ea7d5f255d7b964cc2846cc32445fdd59401ad2031d5f974bf0d5320508a012d1411b85aca9 WHIRLPOOL b1a85fac32116c44ec7a0ede9ed687717e99094f9779957e386c77cfe031323403149b0da3f798b6c7de894cdfc1676d6bfcbf4bf343187e364ecb4e70f3d303
-EBUILD eric-5.3.2.ebuild 3070 SHA256 8d081b97c2ce419602975331c41eb455102c609b70bb3dc8646e8ff57fe62475 SHA512 5603d8e089c70b7366474e1ead664efebeedef16c97dbf34d0240616ceacddb09efe8823dbdd8d8e3bf1c9e456d52c28f0840c5213fe3ec220e47f5fcad48341 WHIRLPOOL 29f1f161e9d048bb24a483d7ad6f84bd1fec4bfbaa6597a53adfcbb0ed49abab7b4731d790225f718ac21b19905500845ed4438abee65cb0b3c093dda2cdb120
+EBUILD eric-5.3.2.ebuild 3068 SHA256 df23ec0075a3f83df6c2a00db11a5fc295654d7e840f99afcc7e5ee959d1ef98 SHA512 4d4d0810edda4615050d7a9badab76d012b725aa1a05a2412fb20587406b4c5dc8169eaa30ad45f3e4288ebd1bc5a504d7809c36df3a62f1331f06d9ad3e47a5 WHIRLPOOL 0d2c5cc6205afea4ed4f81c44f52a4a9701fac86866072041670d949f9eaaffc61e27becf3c47489ca28a8c25d4672ab040971dd33afab9fdf0bf12a09855d4d
 EBUILD eric-5.3.3.ebuild 3073 SHA256 b41d6f63b40b388a825b92a3091444f021f78ddaef2905e49000d126f50a2308 SHA512 c88080514dcfba3fa661ec23f78b951ad6d6f1e3adc7b7ed9422d55beab484a36a683ecf46226956ea665413471d6ac20707b0592e4e9042b2a26385384aec74 WHIRLPOOL bd16e002cac8ee04aefc5f1ebe0537637d2188b9bdcde9a5153d40eae4ccc52db632a6ee637d2dbd59d03f84abb582812abc8b0922049b5bc978ea58819407d6
-MISC ChangeLog 26516 SHA256 506eed94e73691be6865c000038370884b646e0d8a0cef989a53e40aa15ee860 SHA512 80f426400598b859357968b4a5d633fe85468f39ea7b099cfc18e363c09a0f8920af58e70be18e5768596819c59ab1d387741762981c211c88ec41cdb7adefa1 WHIRLPOOL 60fd11289ede0223bed40dc6c8d4c98a99b238c368e08649dae8086a93f5849348088d458aa9acfa9fcc3e9daf86de334686d6dc2c35f5e6a8821f00d5fb59de
+MISC ChangeLog 26639 SHA256 3f16890debe26e7936c5ce73938c0acaafd75cc541582ff46b69b63492f240b7 SHA512 c369a8e233a81b97764f8f353cc5db7124d414a35173aa72b453f575529dff6aa14a3c23b33dbcfc948ccb0d63f9ae571dd7ecb787539f834500669853be38c2 WHIRLPOOL 8ba344d55c4e849909cfb13bb2f69141715f58930090f2b4abed17fb08b4cc42ee6272c0c825fd73df6048aa8b2b446ec2466ca2a3bf16e87d7bea895a9c8a70
 MISC metadata.xml 179 SHA256 1fbdee58e0ba0f8730f6a27979cb7eeed8ebd3afa316d61b34a5f4893291a646 SHA512 27c5c95cf5b26cd3fd03c986b4baa00980d4af079adb673854fc49de3e506f4a9d6a28fba9a5b7439cc7b54fcd5c71c16c1d5b87646c7e2fcaa1962fca839c75 WHIRLPOOL cd2ad0bbb86536f7b810597a04019b1de20c7a3baef72aa7c11d9fcc1bb9a225bb97d043c1ecb2af49c8e1796c265520ae8996b5521dd3476e7610e91e5b2d5a
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQIcBAEBCgAGBQJRnf8ZAAoJELp701BxlEWfJFQQAK4Pe9QEq9u1rrWXm2aPAqbZ
++LAXMTzk29ps3ReUx1luo4V6728NkEiEqI4pNwR1TFLFSD+g1HTghIRwDz5gyFih
+ewfuWSIyHydXxlpyyamiVkiphiBNiMmMTT3mHVO1xtivtKnQ/6oZod8Iq2F61crf
+U4IAs7F7pcKwI6bl08OsiZMEArKyqwN0Yq07XEW98ZWTC2kIHyVe6bQ5b2w8M7Mh
+mlVUrYnpAfi6qvAMeYmujmkPzT1SZMX0fJpa6zW7mDbOTxTBxBXGwsly//+w9g1H
+d5SZju6/SbsVHFZVXhpQikxegsxpccPx6ihdtJeidaM2kL5/P8O2qmT+mel7iDYa
+g8DO9dov6A4eLlhw4XdGqrIrCzJBo4YJhqX+E7yOsn2HXCi1BzjZZe63BLummxTJ
+mQJNcRvOiN9Hucsi3sA25CNOtcHbHIKfZ8JaYxiHcujvrvzrJeXkcEw8PoFv9wGI
+baY4LKc1xRZXvAQXzJnIr38iAOUaYdo2tmxzDVYe7TaukmI5DcaLcr+oAiyAFa3/
+rtIgCxNsNbVCcgohhxxkdTrcOo2lN0uqMiExhkUWkMsPp+fPEkMfmEBEzSMFyRXz
+V+1Y3IhGY8N5IS1tCk9HD9MuqhC5Ru3gFOmACHy7/9iXQ7suJIrzZ9f1gxN2dSCL
+hRkHRqZsRzCwK9+HaAjJ
+=q/JQ
+-----END PGP SIGNATURE-----
diff --git a/dev-util/eric/eric-4.5.10.ebuild b/dev-util/eric/eric-4.5.10.ebuild
index 0e75e6e476c4..21516218ce8c 100644
--- a/dev-util/eric/eric-4.5.10.ebuild
+++ b/dev-util/eric/eric-4.5.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.10.ebuild,v 1.2 2013/05/22 08:10:00 kensington Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-4.5.10.ebuild,v 1.3 2013/05/23 11:35:56 ago Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -21,7 +21,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="kde spell"
 
 DEPEND="
diff --git a/dev-util/eric/eric-5.3.2.ebuild b/dev-util/eric/eric-5.3.2.ebuild
index c061d05cb193..432d3aa14ee0 100644
--- a/dev-util/eric/eric-5.3.2.ebuild
+++ b/dev-util/eric/eric-5.3.2.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-util/eric/eric-5.3.2.ebuild,v 1.1 2013/04/07 23:49:00 pesa Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-util/eric/eric-5.3.2.ebuild,v 1.2 2013/05/23 11:35:56 ago Exp $
 
 EAPI="4"
 PYTHON_DEPEND="3:3.1"
@@ -20,7 +20,7 @@ BASE_URI="mirror://sourceforge/eric-ide/${MY_PN}/stable/${PV}"
 SRC_URI="${BASE_URI}/${MY_P}.tar.gz"
 
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86"
 IUSE="spell"
 
 DEPEND="
diff --git a/dev-vcs/bzr-explorer/ChangeLog b/dev-vcs/bzr-explorer/ChangeLog
index 7a22ccffd3b2..f9807f819ba3 100644
--- a/dev-vcs/bzr-explorer/ChangeLog
+++ b/dev-vcs/bzr-explorer/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/bzr-explorer
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/ChangeLog,v 1.24 2013/05/20 08:22:40 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/ChangeLog,v 1.25 2013/05/22 21:20:29 fauli Exp $
+
+  22 May 2013; Christian Faulhammer 
+  -bzr-explorer-1.2.1.ebuild, -bzr-explorer-1.2.2.ebuild:
+  clean up
 
   20 May 2013; Agostino Sarubbo  bzr-explorer-1.3.0.ebuild:
   Stable for x86, wrt bug #464442
diff --git a/dev-vcs/bzr-explorer/Manifest b/dev-vcs/bzr-explorer/Manifest
index 718bb652c335..cbf26f3dfbe1 100644
--- a/dev-vcs/bzr-explorer/Manifest
+++ b/dev-vcs/bzr-explorer/Manifest
@@ -1,28 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST bzr-explorer-1.2.1.tar.gz 1436910 SHA256 d19d80db6fcf854cbe42991bd5ac47beb2ab2b6c2c7914980db2ebd766ef6fd7 SHA512 7693b848109969eb7f20ec3305ecdf5d3f201078c84d87f00415e3b09651ca3443e1c317a5353315bc0c8328e515470c47de3b06764bf495b12200420e48503b WHIRLPOOL 8cc645cd05379643d389aa56b134630ac1ff93bcc29ee3f6da1c563bfe475fb24eb9543cc976df73a8f434677b6dbecd30427f5899cced5e9d964561e8a990e4
-DIST bzr-explorer-1.2.2.tar.gz 1442649 SHA256 27582c7b76dae066280e0d19708d2a1b44a3e3962759d8b1b3768b7550bb231c SHA512 e02b74aacb0b3d8f82667778cc974799c7a9abf58f45a36b794e1dedeb93ea3a813c0004ef474395838a310b816abbfd54187b7a7a23b2513464b9b654e31014 WHIRLPOOL d7bd7964263c3f9f11650b524a7bd1301ea52103d98da6ecf592b36e6520c6b706c34473ce86937b5f797e0757ee0f586184efab4886e814949e6dce76265a4d
 DIST bzr-explorer-1.3.0.tar.gz 1469939 SHA256 e3584df263a5004765a224cc38d00449e0ad47495070edae59ecbcc4dac94086 SHA512 60cf3e70e5a4e19de3816619646ac0445a7847bc48c640712bd1042fce0cce5964de13e6ad5e1e65b85c9d596f073571ec918c8132c77d7348bc34e1e318b156 WHIRLPOOL b64dada7af2bf7502c7ce7d4d16174ffdb97596789b50b3026631da52d595f491cff930da034aaffa6dab938606f3a8a8312fef30f3070f1a6d59541d56ebc32
-EBUILD bzr-explorer-1.2.1.ebuild 746 SHA256 d1a2cb4b31ae361fb9042112685b87535917930a96474051547891b8d6f65425 SHA512 56484b08efe3e956ecd4e7aaf871764d55852194aa08c8d2458db5d1ba25dab982b5986d2edfefee69b70046fc3202f2599e086939d57f7e4617709bf3004559 WHIRLPOOL a151609d4c7fcb211b44abfd7102572c4063d2447d4c477353be7fc54c41d36bf31e4f7ea5e6a54a6fde8d285107f0ba813c855b9e7a138c46bb8200d81ec299
-EBUILD bzr-explorer-1.2.2.ebuild 741 SHA256 77e8a743fbb6453057e31fe3ae597121d65d6b9466599aef032c120247151761 SHA512 3da79774063240fe4b80589196a93c0a268603b5127bd48571787f3fa019eeb65de8eca66d41a1c9e3536510f9bea49ec8fcb235e911018379683fdbb4d4698f WHIRLPOOL 559bf2157cc458565eb369c1077fdcba65a13b53d8fa268f24edf523db897070bb0b4349d488019454898df1488bc2fb7b6a4c5d8f3440f8a044cb248db8a383
 EBUILD bzr-explorer-1.3.0.ebuild 741 SHA256 2ddcedbe97e23b527bfa42e6c8793cd70a9ff560a7e424ed9594ee4e552b7006 SHA512 0943b4ba3b120ce1bda5c06f5357048cd25892b7cba49a662cc0a71a6125b6ba50639359796371ac88329891965b2656404336ab6f56fbbda04ac206f6c7a985 WHIRLPOOL fbccd472c0cf3462708e08187a104cfb2bf8f13d780f57c0635834b535b321e9948f08f6e1d1b655771a8e64834e2cda89a473095564f51ef92c87ec9f56a15a
-MISC ChangeLog 3313 SHA256 d79582345d751f109949680797cae7ba9f0d21a7143f7692e3b470819cdf3c9f SHA512 e7af83bac7494e6855af07338fcfc3aa4aa49f53fed645620c90eef0533abb207cb144b81be49f5935e4426080034744af247e691cc90f9b9b03c7bf7f3d6a94 WHIRLPOOL 7b788b4918bd3afdee882dfc3bc32952c4b2a83b02c9e3c0c19a2e8e2d7c5b18ff18ad3627b8d0d7de2d532f9713bc1a154676fc6ffb6641e768ae77d70fbd93
+MISC ChangeLog 3440 SHA256 e0ff48aeb23ffb86301de0dfd3c8f78851f4d476d3b01f5495b01ade6aaf470e SHA512 2236c1a288ca41c634e351a4246f39624a631d41edb2b43b907eaace8bfb9439cdd469ead46fa92344989d2212b2e11a24821aa13549ad13f22a5b971accaf6a WHIRLPOOL 21a7e60add909941c3731ff21f6a78f157a552fbd73f3e2581a516b0bb5ca3dcabcf88a1c470b0b2fe6330004536adc1f98efca83c0015d31bcfbfdf7671f24e
 MISC metadata.xml 548 SHA256 9999d2e2ae17e6f69b0494acf7c6724607ca8bdbd060d8f3f8d87822769df48c SHA512 3d571a5d625017ebd9de053b06fda1a69c297c2ec4b0660d6cb5efd7132e6cd68bca012283822467f3b3125331a36676f1e5d4209c6014f93aaf1b363e47709c WHIRLPOOL d380eb326b9b5720d7f8669091b898781f155aeffe0d81fe2478921dd472fad1a0f1d3e800dea7891ade6d7110c4a1fa373b05cc7474613cdd239e30a78dc7e7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRmd1NAAoJELp701BxlEWfXHMP/0m7qTVDo2T7LbdJdCMTWqxm
-J0zlDYWJSh0OpUFxYN4CNSxR6qc+H7b519+4+mv8Ivo5F+tl8hBOrmgnvN5CsjSt
-KdKchxVWI7LgWXQd4w0tEBjiKK/qpWoTx3kxfsbDlq0BHPCFsPKWlL7J/1XEhaO9
-9l3U4guXG2ByLRuuOTuOV7r74649T3OCodMMq/1D0OZ3v/YPhXM3ySx19vU4v+dV
-MFeXkUjSpGUV3lHwle5nmV8Sv89oyddLv7OuqXGLjw0dQhyZjDrXFqmhY8pAb1Zj
-/5lel4kbsWwwZxNwal7167fMG37/6fvZuj70oDrQcDG5hALPY4MrXwMmbu0xEgFK
-YypHZ27jjW9aYxzKf1t4hu1xti81qEbViGaVm8DETIZA3byP7a+XJRHJlJwrm2Ok
-qZHf3NW63kV2rm82rVsgkI5rpVUX7rIbAYiXauGM05dFSrlZUk5w+dLijMAEMf8g
-VfLtsMGRNWoMMvDL0K2D2WM5wwCAPx3LM9A/wtxnE0lczUcYtiTWzE9kWArEK3mx
-VWqhcNDXpagx9SAd656r1lTTA8mPMAnK0X3Gd0Er8tHzCWClJRBnUOxhkBEvCB8V
-0is09AcY+lp5IdC6WuNMGkYMCfu3WNJzY7bUxjg9z7NjuG/28kJJ3dWhMpdpvFkd
-2aqdVk36eKabAOaz35zy
-=PdID
+iEYEAREIAAYFAlGdNqoACgkQNQqtfCuFnePaXwCff/YzOxaMzF84nCdDwGHHuLJF
+NeAAn09A8XrNXvUHcy1skYXiVAY044GK
+=Vpys
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild b/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild
deleted file mode 100644
index 4637a0efc1ed..000000000000
--- a/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild,v 1.5 2012/09/30 18:37:36 armin76 Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PV=${PV/_beta/b}
-MY_PV=${MY_PV/_rc/rc}
-LPV=${MY_PV}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A high level interface to all commonly used Bazaar features"
-HOMEPAGE="https://launchpad.net/bzr-explorer"
-SRC_URI="http://launchpad.net/${PN}/1.2/${LPV}/+download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-DEPEND=""
-RDEPEND=">=dev-vcs/bzr-1.14
-		>=dev-vcs/qbzr-0.21
-		gtk? ( dev-vcs/bzr-gtk )"
diff --git a/dev-vcs/bzr-explorer/bzr-explorer-1.2.2.ebuild b/dev-vcs/bzr-explorer/bzr-explorer-1.2.2.ebuild
deleted file mode 100644
index 961600a4ee5a..000000000000
--- a/dev-vcs/bzr-explorer/bzr-explorer-1.2.2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/bzr-explorer/bzr-explorer-1.2.2.ebuild,v 1.4 2013/01/30 19:01:58 ago Exp $
-
-EAPI="3"
-
-PYTHON_DEPEND="2"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils
-
-MY_PV=${PV/_beta/b}
-MY_PV=${MY_PV/_rc/rc}
-LPV=${MY_PV}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="A high level interface to all commonly used Bazaar features"
-HOMEPAGE="https://launchpad.net/bzr-explorer"
-SRC_URI="http://launchpad.net/${PN}/1.2/${LPV}/+download/${MY_P}.tar.gz"
-LICENSE="GPL-2"
-
-SLOT="0"
-
-KEYWORDS="amd64 x86"
-IUSE="gtk"
-
-DEPEND=""
-RDEPEND=">=dev-vcs/bzr-2.3
-		>=dev-vcs/qbzr-0.22
-		gtk? ( dev-vcs/bzr-gtk )"
diff --git a/dev-vcs/tortoisehg/ChangeLog b/dev-vcs/tortoisehg/ChangeLog
index 1e9177772237..d03d8f1438c8 100644
--- a/dev-vcs/tortoisehg/ChangeLog
+++ b/dev-vcs/tortoisehg/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-vcs/tortoisehg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.39 2013/05/07 00:45:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/ChangeLog,v 1.40 2013/05/23 13:48:59 floppym Exp $
+
+  23 May 2013; Mike Gilbert  tortoisehg-2.8.ebuild,
+  tortoisehg-9999.ebuild:
+  Add PYTHON_USEDEP to qscintilla-python dep, thanks to Nikoli.
 
 *tortoisehg-2.8 (07 May 2013)
 
diff --git a/dev-vcs/tortoisehg/Manifest b/dev-vcs/tortoisehg/Manifest
index 0c7a32247773..0d017c2be39a 100644
--- a/dev-vcs/tortoisehg/Manifest
+++ b/dev-vcs/tortoisehg/Manifest
@@ -8,14 +8,14 @@ DIST tortoisehg-2.8.tar.gz 8978628 SHA256 473aba6d925f91a8461166bcfd5e21a28d05ce
 EBUILD tortoisehg-2.7.1-r1.ebuild 1967 SHA256 8a13c6cb25d7d0dd19aacf312112d09a66a1999add86462f0efb38361847915a SHA512 8c30f876f9ac1d17d1efb0a674cc2f5f7a52bed4c29616eb185b94c8ff3bc7348ae6afcf32cc7d266b89ad0cef56531ebd9d10f13d37d1fd366b7f58ec0c9820 WHIRLPOOL b1d67ed3fa1f352380897a867465aaf82e6b8213f6bfd9f8335b10b07cf2b3928445df0a680c12dbe0e14e8619ea4ac0b7b1561605e4a592aa97e731dc010b3e
 EBUILD tortoisehg-2.7.1.ebuild 1921 SHA256 c84c9e7d5ae19607a825e51cab15f42d335d1eade322bc07e805ffaf450c546b SHA512 3fc659a1899eb2b6b69f6d9fdcf724b432f7f4cb238e96de5fa415f9625aa052ef06214d367974d8855fe8c2d9d268f9346751155d78e3ef8d06b5b21530efcd WHIRLPOOL 0f63fe0cd07c25dd6d7129adf02c416c9e33e403f52443ebb1f8e0d27e03b72c3167cde721af7e938214903e515d4377332904d7e98f0e1cb0f171b3e11d14cc
 EBUILD tortoisehg-2.7.2.ebuild 1921 SHA256 2ff6585afe2c385c835eb1d5ed0ee1194f07d6601af9a1bcaf8c36a667545916 SHA512 0c336fe12d7733d1f3ceba78e063475bfbf5a828c883af06ed2f2c75a536867f3f391fd859fc437e904eb739448f38cbfc2bc36cb7808828a626cc5391d8a1e2 WHIRLPOOL f17759b51cfcb08d62eb721984fa1fe2830036f37f422515e36fb9ed13df574d3bcd3dbc9119bbce893937031ac236f1a2482464940d364a344cc3f776764ce1
-EBUILD tortoisehg-2.8.ebuild 1914 SHA256 6e487d6146ea6fe2b71d1a96236c84aeeb24f7e701c896426a55322ac7008cc6 SHA512 84a8df40b94948d8cdf6b145c818bd0d1ce363cb66fef03a5089253f83e47b46bf2b835bb843284db3bf97a5c753bcea25083f3764ffbbb45743c39b62b2281e WHIRLPOOL 5c33b157c0c371bb34c90cb4d085080a63c906d9d73f9690e29c228d8e9b7040977a0edcd9a94774ccf8bf642d2ef1757c97399ce84bfef7aaf2aff377fd99f8
-EBUILD tortoisehg-9999.ebuild 1916 SHA256 a55f4ba4229c8d3ab3b2fcb8ae57790ea8a2d8b7f1cf412afb356f29286d7bfd SHA512 33eef9c907089642e53c024b5e7e5c613b295a3dd0f1c13a1de975835fd040940c56e8e55e33ae5908b0817d9c72174b2d7cc89a1c84a4238ab79e3777d818ec WHIRLPOOL d3e08ff9ebfd7b95f4c857c745dfb8f6cea2518d2d681113594e9c7e4b231025df586508dd98c88fb5a41d556d0c8ee5a1d7467b3a0461e46f67d8ec39f511ad
-MISC ChangeLog 6645 SHA256 e6531c61d730ca2fdfcbd6dab8360bf1e983c6e4129f94c0e0e3bce097068133 SHA512 13a7ba3492719392194ce2cee853c6779bdbdc2a32092428d8b9644bb82642f07b2fb2b89e80ed6ddb137cc687bab6d8a2e1b3095c1b6b8bca25345978bbb0ed WHIRLPOOL ca18d75c1c557e5a442e991b4eb2fafd84dd5f2ff2a17568c107d783e9ea3353766572c10c0ab36828143440dc55467ec402b11d2916315b52f7f0d831cbe382
+EBUILD tortoisehg-2.8.ebuild 1932 SHA256 2d28a9a5d85b4a300559a61c4b02d140b3b410196e4d14d42654de0cd334f1d6 SHA512 a7e680734d4521580340e9846db22a2cdac7d2523d4974d683eeaaf0f28101a6fc3b3effd83f6db32215181dc9a92aeb0881f2af651e0b04c9087064edb741b6 WHIRLPOOL 3eb895279c2fb2cfb2f746ee67f9f8a48b8710e9c492af7322e253d1d9be64f2708fdac31757bfa8d0a3e6eff8e6c5dfec1b9259c80c4438a10b5ce017412478
+EBUILD tortoisehg-9999.ebuild 1934 SHA256 f42b9203545268457ff947494de9770efeca5abe60eb295275ae77ce6131d2d0 SHA512 8139381f2c0273cbc6898190b7997e30a60c085f41ed13c8b10f47606b47ca0e3beeba35a5c4633bc07ff0ab1ba714c4b15fc1fa53b3c959031d724af04a9b72 WHIRLPOOL 79e8f46a7cd5a6904febb838a4e05c71c6fab89146e29518a51f44e7eb213569367797a166b444b9bcea6233765fdf94856809328f6cf7afcc7ec10df098e0e1
+MISC ChangeLog 6808 SHA256 a39dd22ace42fbdf81fbf196950f5033b37cda70b70f5583909970220f6142d0 SHA512 2a76e0d06373b2318f2e698d2930aa1726de377671895345dcaa60fb8152cf9c64578da88e3ccde6170979957e97e7b119358d2912e9be0da38d0fba14f8eedb WHIRLPOOL be115db58ffd9759b75e8a29849c6194321d439ed9d4531886fd9d4127447df95db0d8293928bb0947c9a1d1ddf18c0b5475162c9c8370d803e260cd104fc809
 MISC metadata.xml 330 SHA256 d7ad48468c73b97db8462532efe7a2b1858883ed765e9c62b60dd9ab51fe9793 SHA512 6ea38fb93b6f671785062726c2a62ed042d270475e7657763bcda1ccd94ca8fa14396c7e0fde65ed8b827638d0a190e0c0699673359a5bf95e4fa965d6ca8e4c WHIRLPOOL 2dd5a5d00e461b1e47c674a185554b25bd28b923167f877d0a097c498a8f652a1302c18f5a475b9b0ca7b028184635a76e3ea03789fce2e4a82b8ed55ce7081a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlGITroACgkQC77qH+pIQ6SzHgD/XetD65noDJGKBYKk67SkAYIp
-KZ+z5yQQnqUmWUC/+OIA/Rn8Y+Gqzs8iqq8a/FQYJN4EnJrdkJEoqX5Rei3M7gDY
-=fABn
+iF4EAREIAAYFAlGeHk0ACgkQC77qH+pIQ6S4pgD/WbrGgJXnYrlFYJ8HR0DTOGWF
+vs+DiJN3eHScL/QyhAkBAJQ/C51HOZvgNbt2lABBSWqEtsdv5wV7Vlt0+j0fEkK+
+=AJ4x
 -----END PGP SIGNATURE-----
diff --git a/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild b/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild
index 4c2bce07e5ee..e60d66565f6e 100644
--- a/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-2.8.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-vcs/tortoisehg/tortoisehg-2.8.ebuild,v 1.1 2013/05/07 00:45:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-2.8.ebuild,v 1.2 2013/05/23 13:48:59 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -31,7 +31,7 @@ RDEPEND="${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
-	dev-python/qscintilla-python"
+	dev-python/qscintilla-python[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
diff --git a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild b/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
index 4b51b48a9942..1ecc12fa8426 100644
--- a/dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+++ b/dev-vcs/tortoisehg/tortoisehg-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/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.20 2013/05/07 00:45:39 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-vcs/tortoisehg/tortoisehg-9999.ebuild,v 1.21 2013/05/23 13:48:59 floppym Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_5,2_6,2_7} )
@@ -31,7 +31,7 @@ RDEPEND="${HG_DEPEND}
 	dev-python/iniparse[${PYTHON_USEDEP}]
 	dev-python/pygments[${PYTHON_USEDEP}]
 	dev-python/PyQt4[svg,${PYTHON_USEDEP}]
-	dev-python/qscintilla-python"
+	dev-python/qscintilla-python[${PYTHON_USEDEP}]"
 DEPEND="${RDEPEND}
 	doc? ( >=dev-python/sphinx-1.0.3 )"
 
diff --git a/games-misc/katawa-shoujo/ChangeLog b/games-misc/katawa-shoujo/ChangeLog
index 023a92e1ed97..45c7bf116dbf 100644
--- a/games-misc/katawa-shoujo/ChangeLog
+++ b/games-misc/katawa-shoujo/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for games-misc/katawa-shoujo
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/ChangeLog,v 1.3 2013/03/17 15:17:56 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/ChangeLog,v 1.4 2013/05/23 14:24:43 pinkbyte Exp $
+
+  23 May 2013; Sergey Popov  katawa-shoujo-1.0-r1.ebuild:
+  Non-maintainer commit: fix SRC_URI wrt bug #469710
 
   17 Mar 2013; Markos Chandras  metadata.xml:
   Add proxy-maintainers to metadata.xml
diff --git a/games-misc/katawa-shoujo/Manifest b/games-misc/katawa-shoujo/Manifest
index 0025d1f551d9..bed1d7ad89ba 100644
--- a/games-misc/katawa-shoujo/Manifest
+++ b/games-misc/katawa-shoujo/Manifest
@@ -4,25 +4,17 @@ Hash: SHA256
 DIST katawa-shoujo-1.0.tar.bz2 476084998 SHA256 7c39ff74fd47f235bf9c9ad3440b3c5c45e63f8d7aa8069ae49dd3acdfd7477a SHA512 737d5ccffe5977c6d7dddc6b4f3cac2e059b39cb8c981239c4c64046f0d718b5f58964a7ba277968d4857db2e4ab67c3ac8b1befa5c1ca560ade6fdce8fea857 WHIRLPOOL 84df55dfbe12792ea9d7a6890e5de56d8765b9c21410ae64374560623a410d18f1d8ecc55fed4bcd5b619613a6f08ca5be3741559584ffd883bccd2ed83a04d1
 DIST katawa-shoujo-256.png 59803 SHA256 8130b39af5341b0e1c85cbd6ef5be229de2877d696e5b372e1aacf176778df45 SHA512 7d920c24f4182ba72d5b3d641d7d373c166ca4c7d0b6a396f5e3b9281cb43f7e6e8e761f2f181ff061705118b3080807866fcd290d2b471e98c3a584d5fa8e0e WHIRLPOOL d2b06b26d2ea5bae5292fc5e6f3f4571fa82a4f70155e38a3c8a21778caabc37b2a13b2cb7637a0fb05a55243a63e23c96d0538bbcbc631810f15c069d26f590
 DIST katawa-shoujo-48.png 3621 SHA256 a366a52fd9dd241182d163e28a37f537fa71d5d46f1fc899da08b492c371a0fd SHA512 ad24156cf446ffe92068baaa6d512e6bab90587db5ce01b3c18e6c42bb9b8c91f7eae3e9547099d3f8f0a5d3f144676c3499c0a38d9af845abf79e153b543bef WHIRLPOOL b62253218dbb981f32007e22cdd36decac8948e4dff416ca60de3daaab8cfad9773622e194b885c0145a499008751c5a09184b7f0a0dc3b9153d751dd0d1b584
-EBUILD katawa-shoujo-1.0-r1.ebuild 1871 SHA256 0fdd8e6879c0ed77f4e587d05d7ff9f63c82b3e0ac1632ef765f94850925a907 SHA512 f4ccb0380714ba1b3e6264d7cc4f9ef80115bb8df4f707fa43e5be6366c99bd30e96032986c8b205d0d936c379cd286bff1bfb1c6de8df119002549b39a5658e WHIRLPOOL 13413c6242846681ba8f4b27c062da784d921e115d508530cbaf61fc5550d1ca0106b630b750449446a694ec513564eef6bf5533a768bac3087a528d12a2eb35
-MISC ChangeLog 689 SHA256 0ad851c9bdf446f82833e7989fb15d6b17ea96097c3afedf2c14fcbfa5e3ceae SHA512 c18fcb8316ab855e06b3d09b33e8fcdb01e6548bf04d444b44b4b340d23f65a057870bb7afbb4006d6b1c1c0d5503738b6071f60949db584c221a00e634bfecc WHIRLPOOL f995aed7842ba097080056452d7ba7a7e8bfa4e9d735a1b140befe4d82b899db38197b58ca98e1092737ed39d9f53321abf89b69ad510d46148a4ea27ad72431
+EBUILD katawa-shoujo-1.0-r1.ebuild 1930 SHA256 e432bcf9eef06661ec56f8488485790fa2ed570161d4416e3a7695b422dba466 SHA512 7897535d9ebe3c6558863db0aaf58c45caea2aab67dee3416cafc455880790bf8ec6805a094decefe8b090d3f4185ee6f8115fb96c37684b8be23c71bcde8d5e WHIRLPOOL 18b3175870dd2e1df163594609ebdc520ad260bfa8b812aba74119842aaa2c04daecd30041fc2f9414336a521394b71afbe48996b0e1601afb951d12926bdf92
+MISC ChangeLog 822 SHA256 526a5d3e155e25701352d26d41bc93f148f43226569ba27f6e8529d7fc382335 SHA512 01c5f5584d15435040c5380e6d4d1c6d59889c3247efa02e15c0e29bde50a5fac066bfade0b589b6b9c7e43536dafd36eac35938bc7213ddcc87889b6a448bbb WHIRLPOOL 573ed3f30472591103f488fa77e4479e91a4d4b89285d1bf7a8fba5b6483058be07a3990bef98cb10de7b4c5c26957cc0570bb860b81da29934d9b1b2e54d707
 MISC metadata.xml 1254 SHA256 9b3cbd8ebb32ac762a87cb93f76fc5190e5c3498fb584e46ccd312b13d8ce50e SHA512 116194e53d65b7f41e62c6ccdead70f9f2c6e7fd022ee19e41a2c0d2f6dfd4630d4c42d2a91419de96f7b00255df54149d79ad68803a1da328cb122383549ac4 WHIRLPOOL 7d5713fa44127ec7bbb6fb599d7d4ed7f44d8852dd14f8c87905fc82a0e4900025d7ffa6cbcf4e6de375b70344d43a92e5c6bdee4ed2309a314f7ca50f4a4c1e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRRd6lXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
-OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88XBAP/3ynm3VteaCrwKcy/Q61TSR0
-i0Lybs7TTkKb3h857xn5kvnxOyedb6PFKTMGt0muHnudad+lrsiM51yd69woaweH
-BructsFv1n73xa60A2h7gjKbFp8bhmc4hrAKRP8zndLzxtTHj+N5K63KQ6fvQkIp
-4HywkgIAq9WewAp8ylPfsJIIDSnueNI+W40lpro1b5fLdIalQhYelQQ0MmO2WHCT
-llmOXzs+6PANB2au45TigY4r+5W8MSlMvLb2jaz69lqVq/Dbeqw06ed3M+opzd49
-fWafRvpzwkuED7+OJ+lWBjGtusJf+v+Bh5QzPliCFCXP40vSWOeKdxiZXaEnFX3p
-qhiaimfj6cjKpVh8z2jzUd0+oC2k3xYzDhXo7ZOQ+xedXgQH4xyFWBqrb11Pfb5l
-jfSKm5y0GB9+x0uBokiBZFqK2EC8t5WRhhkG+ZoSLM3s/wl6jA2w4jh03igQGJaU
-KbjPH9wYIm69Nc3xcj8gegFclQO1eZudpFAQF9WOVXVDR8ElYgC0vpawydnTMHp0
-+ADWmIxZyMnk5g+mWmf6VFNeoXZ2Xn0Y4H8yPsFPCEFrVBP0VeV2voPUawx5OqmI
-NIzxWNU+ckFgSfxdXM4qNhBvFiJWpV1orm0/pWdUkpQ/OkO0SGl83QnJKJp8CeNW
-dyprFtad3QwCbtziB6xd
-=Hcdx
+iQEcBAEBCAAGBQJRniaWAAoJECo/aRed9267qjcH/1pyJD2N0nsKGLGoTGbcblJO
+ScDkcbWPbTaGoohdAeZLRFzXXjt0/qo87Jml90VrFxyfOgx0THh096gpPZWwChlS
+S9eyhVmcOc/28Li54yZacq95AJvysQacQOSQAyiEfORZumU91QLh5pSjor/130Ia
+/BjpomX/ZhGqGOIHHj03R+/N585d9w18lP79p5CAZ2GdPcUD7rRRaC5eckJOSU4d
+8EP1f3ovn1UIgIfjjfgoamYLcSx9eupew0FrF6mT+RfeFO3OnamXcunBQCWj5o2+
+cDND11UYpni3zIghRHI/NWKTBmw9ioAa4+U4ibJJF0sPtyxiAgrjGwkPpKkxOWw=
+=/BLO
 -----END PGP SIGNATURE-----
diff --git a/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild b/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild
index 8589d91f1acb..8cf282d9e429 100644
--- a/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild
+++ b/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild,v 1.1 2013/02/28 21:38:07 hasufell Exp $
+# $Header: /var/cvsroot/gentoo-x86/games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild,v 1.2 2013/05/23 14:24:43 pinkbyte Exp $
 
 EAPI=5
 
@@ -8,7 +8,7 @@ inherit eutils gnome2-utils games
 
 DESCRIPTION="Bishoujo-style visual novel set in the fictional Yamaku High School for disabled children"
 HOMEPAGE="http://katawa-shoujo.com/"
-SRC_URI="http://naodesu.org/files/katawa-shoujo/${P}.tar.bz2
+SRC_URI="http://dl.katawa-shoujo.com/gold/%5b4ls%5d_katawa_shoujo_%5blinux-x86%5d%5bEA1DFB30%5d.tar.bz2 -> ${P}.tar.bz2
 	http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png
 	http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png"
 
diff --git a/kde-misc/akonadi-git-resource/ChangeLog b/kde-misc/akonadi-git-resource/ChangeLog
index ca3df587cc25..a9dca376a32e 100644
--- a/kde-misc/akonadi-git-resource/ChangeLog
+++ b/kde-misc/akonadi-git-resource/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-misc/akonadi-git-resource
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-git-resource/ChangeLog,v 1.3 2012/05/25 18:52:08 radhermit Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-git-resource/ChangeLog,v 1.4 2013/05/22 18:17:19 johu Exp $
+
+*akonadi-git-resource-0_p20130522 (22 May 2013)
+
+  22 May 2013; Johannes Huber 
+  +akonadi-git-resource-0_p20130522.ebuild:
+  New snapshot.
 
   25 May 2012; Tim Harder 
   -akonadi-git-resource-0_p20120216.ebuild:
@@ -17,4 +23,3 @@
   16 Feb 2012; Johannes Huber 
   +akonadi-git-resource-0_p20120216.ebuild, +metadata.xml:
   New package. Import from kde overlay. Ebuild by me.
-
diff --git a/kde-misc/akonadi-git-resource/Manifest b/kde-misc/akonadi-git-resource/Manifest
index 88979ea1534a..77a2a71c6fa9 100644
--- a/kde-misc/akonadi-git-resource/Manifest
+++ b/kde-misc/akonadi-git-resource/Manifest
@@ -1,18 +1,20 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST akonadi-git-resource-0_p20120222.tar.xz 10256 RMD160 0cfa88853d999b608d26f22a76dd98a71ea47f06 SHA1 60827c0e3b7db40397997cc187e61255df20b89b SHA256 8f531d1742675a9c9e8c5c38cb021bd80d17009798269b584db88f29151ddae0
-EBUILD akonadi-git-resource-0_p20120222.ebuild 642 RMD160 73560d832902d4c3e267de6eb4174c5698f8b0fe SHA1 56f67cfd35ef86cf9280334e6cd24739f79fb080 SHA256 02174707936ede3bf011091ab5001a9a3e5bc77ac4168c756872e4de0101cc14
-MISC ChangeLog 711 RMD160 6ddd4c097a3cc984f7e230c12f0a0209bd52b42d SHA1 da3aef33392efe876310c8eff38df2277ab92a11 SHA256 50d0f3f374efcd8079c7409af462ed99a5f2ec55acecc94209c42189e9ccb7b6
-MISC metadata.xml 157 RMD160 09fb7b798f3f68127626e97c69e5215a0513ecbb SHA1 d5ffebb2f4248fc8f65ab21c3af6e4f5dbf8bf6e SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892
+DIST akonadi-git-resource-0_p20120222.tar.xz 10256 SHA256 8f531d1742675a9c9e8c5c38cb021bd80d17009798269b584db88f29151ddae0
+DIST akonadi-git-resource-0_p20130522.tar.xz 10908 SHA256 0ce0495ae5664f48d63a77965e413fef98e2ba77ee6e6c050cb615a67e39acf6 SHA512 4137eaf49b48a8f4d3fa90a0287f31f09396231abc5d08ea8d620781822b6bf8f64631d7ed5c9a797950c1874b68b03a28ef3fb9c23404445430491c9ffdd678 WHIRLPOOL 30e4561db78d74b5ca4be11e224a2bef7edc065817bab83522ba8c3607df1c3d0013a828c3ff9f6a03e94005e6ab53a6d10818cab2d1c076e4a1c3f96c19618c
+EBUILD akonadi-git-resource-0_p20120222.ebuild 642 SHA256 02174707936ede3bf011091ab5001a9a3e5bc77ac4168c756872e4de0101cc14 SHA512 d1456112c0e813b441c086123e43ac25807df394eeb21d71c3462e5799edf1210de057bbe5d2e083de03bff7c1323149f87a1382631d7d7076f6d73e685a7f25 WHIRLPOOL 3ee978cd5df36e00674200b8901bec9f1ab5aecc397f690b03ff5d41464bdb282639796b1b7832c05c45877753c5af9ad3cc9782e0f989639576c30593da2f85
+EBUILD akonadi-git-resource-0_p20130522.ebuild 614 SHA256 10a699e16f21a90a0de5d2d0741b687afccf71e1b347083f4f67b75d37cafdb3 SHA512 5e165d4090bb54fb37178af6b7aaefdd67ee1199e0271c59458d291c4b8205810aea6d703fdeccccd0f4edf66005f68273ff9b864475c8082daa52f75f0a037f WHIRLPOOL 97b47977da9a1f161fb478906b2948e077357461997532adb14c516fef71649bb33d73c39152c41f422a3b676c099c367d75b2513a4613916525fe2782f4a630
+MISC ChangeLog 863 SHA256 b8a05fd0e607e610d82812e4d6132a165036f3d0f8d45566c6013fee2ea340d8 SHA512 513946826b96242c89ce65967e38823fb763d0d7b2d9edfc901f3d32cc14e355abe9123a16138fd8191459d700e17d30206e45e7e827bd0e793bdf86bf888877 WHIRLPOOL a322c2c88159c0283d62e8c51f5616300def945b765556019bdfd8a089264e3406e269d9f136014bccd17bb1659f26e6c87d1542bbacdf13f690a68e48058daf
+MISC metadata.xml 157 SHA256 01f6fa4357ce08e8b0f7900a51fa78c7f060fefc7c7da98acaec1e283dd59892 SHA512 657d6b0a31ceb7ac10bedfd5cbd634d4ff47938bd2f321203f0233e53686f7e0fd460e81f82793804895c7e97cfa472c1ca44b93314574262ee8cc5745a3efd0 WHIRLPOOL 785331909f1834cdd5d797ad484ea0e35c3e44c79a8a7517a6fb5de926acd181abd57910c8d960fb2e11ea38ddea336bca309af16fcc2df68fe4b602bca120b3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPv9TrAAoJEEqz6FtPBkyjdkkH/jVuCImZ/wrJ2suFRgiGdbUf
-exDPns/Ym1mgfzDrHUxz6pP3NNGZwtymirI8o1dGn2saljAv2XAv3sG+tQbieEAM
-1DA0XwScyuXILn1sgwCXZifZU5/4A5Wf6EKc25Ol23MDvYAaCyXzNs1yM7unGQQX
-MO03ZuOU5MEncxt3HTF0FwekHzppbg+qJ6d+7jfz6NC1aalrmLSSPOHCjh0eA35p
-033gsOSf4TQ+77iItnKbRppXDcQzLsk+mpsVjlHPX/CDRgOdgM17to+QvP4ni+kH
-8PKK04nvOrSMvx5ciTgCKyOMhd6iLpFxUwKAW3YzpPyA8XQ8xY/H6ChVi6GDTbA=
-=yYRd
+iQEcBAEBCAAGBQJRnQu5AAoJEO+t9ga+3I3ae74IAIonQPJ09DHu3wznj+5CS42S
+vtt1TIWiUAgUXrsrLmfCiO1JbyezOuqlHZmlM0dfmQk298xT1vLJsYbl4p4dQM6L
+wgH5xINBPVWrT2ynyCsSkSyaqVI/Hs3sDXPnLtywYa7xbZOFl0BmSTRxhlexhIiU
+uAcsO1XlXjIlJOXitRGutZU8l8HkmTcLixU1xKw2WBoYjP2s27hqrkxE72GWLZgX
+1aIto0+cGDFlas58iKHn6hlNqVBoJaYjkM1pNHYbf4XEC4tVEteym0/ATI8MsnvH
+BoFHWC6G+kxmJhpazvcu2KMkTfLg36cyeIN20pf2QpiMhHtoXAjT/6qFmi25ywQ=
+=SKkl
 -----END PGP SIGNATURE-----
diff --git a/kde-misc/akonadi-git-resource/akonadi-git-resource-0_p20130522.ebuild b/kde-misc/akonadi-git-resource/akonadi-git-resource-0_p20130522.ebuild
new file mode 100644
index 000000000000..24b27e084293
--- /dev/null
+++ b/kde-misc/akonadi-git-resource/akonadi-git-resource-0_p20130522.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-misc/akonadi-git-resource/akonadi-git-resource-0_p20130522.ebuild,v 1.1 2013/05/22 18:17:19 johu Exp $
+
+EAPI=5
+
+inherit kde4-base
+
+DESCRIPTION="Git commit integration in Akonadi"
+HOMEPAGE="https://projects.kde.org/projects/playground/pim/akonadi-git-resource"
+LICENSE="GPL-2"
+
+SRC_URI="http://dev.gentoo.org/~johu/distfiles/${P}.tar.xz"
+
+SLOT="4"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs semantic-desktop)
+	=dev-libs/libgit2-0.17*
+"
diff --git a/mail-client/clawsker/ChangeLog b/mail-client/clawsker/ChangeLog
index 6921a3488374..b690a17535b2 100644
--- a/mail-client/clawsker/ChangeLog
+++ b/mail-client/clawsker/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for mail-client/clawsker
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/clawsker/ChangeLog,v 1.30 2012/12/27 22:26:59 fauli Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/clawsker/ChangeLog,v 1.31 2013/05/22 21:47:18 fauli Exp $
+
+*clawsker-0.7.10 (22 May 2013)
+
+  22 May 2013; Christian Faulhammer  +clawsker-0.7.10.ebuild:
+  version bump
 
   27 Dec 2012; Christian Faulhammer  -clawsker-0.7.7.ebuild:
   clean up
diff --git a/mail-client/clawsker/Manifest b/mail-client/clawsker/Manifest
index 0d2992aa4f0d..c08d8e1aa005 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -1,14 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+DIST clawsker-0.7.10.tar.gz 67488 SHA256 c044f9a7469c828abcb397b42fd2215845b9d655aa82917b51eeb2c41c274594 SHA512 1b7b3638485af509e4b32be5cdb6ffa2e56b7ddb661dbde291ac4cb7804c98363ddcaa46d36ffba0699c77d0a66e84ff5b58be29ddb3d7d9f9ec0e6567a9075f WHIRLPOOL d9b822bd1a4e6f91d8386f85313a4b1d35905aada17da97bafc97c830f22202e193e736cc7710711ca8ca14e7c34243424e8e6364b1f8f3617cc3a49e7e6e336
 DIST clawsker-0.7.8.tar.gz 66210 SHA256 133f89db736f77979603ebf02eea4fbcb654fb69cfcf2301c3598ff52ac61155 SHA512 2dd1cccc45641aeb58769630f095d23f68b0bdc8276711cea1d25597c2c3fd94ef5b318bafc5332f4c3880715052949f07e3a2b8ad554baa4b871434547abdca WHIRLPOOL cf65547430ab6ceec335e58e312b5bae7116381b87e957273a7d3594f95479958a8cfd7349fe50b68c89e0b0a03a6a14d453761c134c381253579b46bea00350
+EBUILD clawsker-0.7.10.ebuild 670 SHA256 6ea5974312a572dfab94e99979b739449006edbdeead075d5eceb0f43f20c273 SHA512 de12c5cd4f76a38b83cec03ccee20418e280d9c4f5cdd45b461e859ecd4810120afe40f879e0c887e9323185ae29314c62463f92782f42e6359873b1db998de7 WHIRLPOOL 29e8a8e663987513d9b624042922930ae0c8d6e9d35aa74d339a6d9a04c3b20918c40e9ae58a4fa328c412be70320c9d8a844bbc1104787e2f047208d69b784e
 EBUILD clawsker-0.7.8.ebuild 671 SHA256 9ebd3f2351f972119f253e7b7080ca62a1e32677e8c17510ec4e1681f3fade15 SHA512 510c33213d6821df916bd10776dcd396256006ef16bde16848f6f7f0c8130d72351180c17f08e9ede189ed59594bc77e0c2e7e257823d51fac7f33ef3d0552b2 WHIRLPOOL c511e49d57d867859801a64743a48ac5e84e4032163934a18644fb472070826adcbc3faac460d2a1c2c0ddbbd76b471aa44827c205c8b889670a9d019d6e1906
-MISC ChangeLog 3401 SHA256 593d407a34cc5b12de146e8f41b99fa983be8d8f67efb5617f1efbe65c269b46 SHA512 deca41bd840a870d5e32c2c3c36c1c01e85b45128d931c4fdaa89967d04dbe840f2e92fa2e76267ad3c2a3c325704f6f1ce3e20416eedaede7ec64e824045100 WHIRLPOOL c1b60a128bdbdf0a6b3b1b27d9d2404b26f165ecb9498ba673e76e470d5aa30ffba74409191b5e28835481147b39d5b97dffc93597da30f063085aee6fbec708
+MISC ChangeLog 3529 SHA256 d2c748409d337396491b3f8b1dfae2a2db6ccdba13c9989d6fe48b53c8e9fd5b SHA512 1c204ff066a0f98d9b6ab7f6d0ccd7a21a7e3b7b4cab8e896c231279228248bc543326166f5bcf04334b6c3b4e3c14942690880dcde9f51085206fcc88acaff7 WHIRLPOOL 4272d9c22148136f02610c224517656fec88c547cf580b016efd81aaaac7ffea6d47e64a8796f8fa06bceaec0830a45481b9ace28550e1942a6cece0ef3e17b6
 MISC metadata.xml 263 SHA256 fccc92cbfc301eb65d5ea4c614dd69b256cf2a6ddc17fa631e28420d0d2b1622 SHA512 951dba4b79af455c34b4e3519813e09d19c4b6bc0cde462a0917093528f3745d7474f803968da7f16d7e63c9053f41d1f698744f04b6bf606e4ca948993c8701 WHIRLPOOL 0068c0b9e1fd8d29ca3609b0f0d638dd93a4c4ed4b47fc0c336b2407c1b60cd8e4dd6ff5fa17f473280b9bc1c8b2c6580206dd04ed8e3007a72b268541e68188
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlDcy18ACgkQNQqtfCuFneMzhACdGgojv83lrIj1Xb+JeUhCH/uq
-b2gAniHFWB1FPGhSuGFNlGDh4jpe8TVh
-=ERF7
+iEYEAREIAAYFAlGdPO0ACgkQNQqtfCuFneObBACfRYXKrfV2XTJNQXZ7Tu16HMMh
+ZhoAnRAUFr/3s5bHypCO5FDRKlbW/Ea+
+=tmAh
 -----END PGP SIGNATURE-----
diff --git a/mail-client/clawsker/clawsker-0.7.10.ebuild b/mail-client/clawsker/clawsker-0.7.10.ebuild
new file mode 100644
index 000000000000..88fee3a91f6c
--- /dev/null
+++ b/mail-client/clawsker/clawsker-0.7.10.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/mail-client/clawsker/clawsker-0.7.10.ebuild,v 1.1 2013/05/22 21:47:18 fauli Exp $
+
+DESCRIPTION="Applet to edit Claws Mail's hidden preferences."
+HOMEPAGE="http://www.claws-mail.org/clawsker/"
+SRC_URI="http://www.claws-mail.org/tools/${P}.tar.gz"
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=dev-lang/perl-5.8.0
+	>=dev-perl/gtk2-perl-1.200
+	>=dev-perl/Locale-gettext-1.05
+	>=mail-client/claws-mail-3.5.0"
+
+src_compile() {
+	emake || die
+}
+
+src_install() {
+	emake install DESTDIR="${D}" PREFIX=/usr || die
+}
diff --git a/mail-client/sylpheed/ChangeLog b/mail-client/sylpheed/ChangeLog
index 41dc1dbebc3d..11952d167416 100644
--- a/mail-client/sylpheed/ChangeLog
+++ b/mail-client/sylpheed/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for mail-client/sylpheed
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.329 2013/04/12 17:19:34 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/ChangeLog,v 1.330 2013/05/23 14:48:46 hattya Exp $
+
+  23 May 2013; Akinori Hattori  -sylpheed-3.2.0.ebuild:
+  remove old ebuild
 
   12 Apr 2013; Agostino Sarubbo  sylpheed-3.3.0.ebuild:
   Stable for ia64, wrt bug #457358
diff --git a/mail-client/sylpheed/Manifest b/mail-client/sylpheed/Manifest
index 0f5b461ba17b..f425abd205c3 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,26 +1,14 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-DIST sylpheed-3.2.0.tar.bz2 3288292 SHA256 4aeb7c6436ad485a2cc101dd68a1fb84abcad4c6471ed9ddefec65e482e5b2b1 SHA512 06abd88cede0544eecb921043aa596f19c0b2931029d2d63efec907743a7edccf25ae7c817967c3be080f68602395e90b4fd1e73a643cd66fa9e9bc378a525f1 WHIRLPOOL 83851037c9ad1168c89aa95dd1549814a8252758a5757972e0372b33a8982f736012681be58cd269d304dbd00a770f3b8600e66badb41c48c617507c42e60981
 DIST sylpheed-3.3.0.tar.bz2 3294536 SHA256 4d8f791aaf0f347439512aec72cd8262f90e020352cb2f7b63727ac5bc07353b SHA512 75e2a7573b2eba0f54386e020a82daee7219e45cd032b4568b04362c88fe84bdde6a4023e1259ea06767944c32f605d739121aa7e389b4538924c6eefafff372 WHIRLPOOL c31a173f6f39cf4177bb32083efc97387d9477e11f270f08de7cb650f2af997a52b0031daa44c0f07d78aab692735c0dd7b1e4f1c887cd1f09cd042d5ddabfe9
-EBUILD sylpheed-3.2.0.ebuild 1436 SHA256 030a0649e520bd88631d1c7ee100ed6bde3e95a9a9840e0fc85b820d47b35846 SHA512 4bfad561c7d2a5a71379bd650156d6a38ed9e92951b61c4b43aa1dcc22fc28073b45cfa171efe848a801a2ef2aeed9433c2c2ca47d8c3712eef0727937944745 WHIRLPOOL 50bd4d984fe46ff849b7ee83f18a89c75efe2fb3c6b316c2a3aa318f0a9cc5085d076ad3433607ef1cb2ecf880f50297d2dbafbc9bb3368ef94bb065d84289f4
 EBUILD sylpheed-3.3.0.ebuild 1436 SHA256 80186216f4680c81de1efe28f3a79f7e03c96b0a8e4ac13439ab22aceb328a1b SHA512 884bc2f1a2610d98d8ad315167714d50b60aea0cefcf660a4e2525540864b8c972e5828b74c32565ff7858fdd192e995d59b0644f707d791c24d4d8832203a1c WHIRLPOOL 19f0b26cde52767ffb6e1645f86f525fa2b8a5e1eb51b3e9d5bc9e01128880bca3f41b7931561998419645b7dd1e106707bbf93f74b826d49b1ca3563478eebf
-MISC ChangeLog 50838 SHA256 776daaa9531415b5a369e04ebbe36fd66a4a7751445021638692e629b9632589 SHA512 fd0623d0cc168a19b5d4d1c00301863d690471145277b754438d79860f2ceeafc917d6d479e7e1216dc3e136e24ec76db502db951a467316fae91fc9552f93e0 WHIRLPOOL 8368cdc438628a9fb7c53dc5b7ba0d164ad35e00ed453da55912c0cc5d6cb0d2f26b1f91c3b7c3060b6da70e398a1120b75d75c5ff38651e0753c8b768305049
+MISC ChangeLog 50937 SHA256 3d73cb913e253377edf958ccd2104a644e82ed7f883eb757aab770f9f19fda95 SHA512 96acc6cfadd5c93da6b28403f685917702bf5a854b8019e5d490c15d9b4fee56c55dd608414d9e4d39d82a83d70625907334a2dbf61e429b1e7cf6dda5747035 WHIRLPOOL 2565fe5de37c768b9e84af7cb4c1767be5ad0cbff3bbbe9d24a03355c0ee2f4c1c85f8222ec5309e9a0a8603bff7fed4d4f58821f499f9bd159821e193a7040e
 MISC metadata.xml 339 SHA256 ba4beec56bd0eaed052b930e04b2a31aec70c619a91fdee00ecfa33f2d4c8c1d SHA512 78efddf3fd0e13ec9f8d59a7cf3a84ecc126ea1cbf2007b66b00cc439774105487b605bf68faed42e3313cd07a23b92dd9e027b4897ccf0c0b860fdafba0928e WHIRLPOOL b5f0d9cba31f731cea0e648e891a3a616eed64375521912d62c1396faa6c96ed144af2e997d8864dd57351d88ebd163a74f73b8f221d5c5932b3e5cc7f29fba9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRaEGOAAoJELp701BxlEWf6+4P/3Hj2m7q8SW6PzvsdUT6cRGS
-iirSjcpnTT2fhxbMMtV6VkhDGy7AXAXhIdK3eEyBvjh3eQQ6G6TERF4odX4T/PBv
-mb3qBnDdeAcb53gzBSx7cP3vdIxr6lU9sBWbQZFkrrrm7MNWDaUVyw47Rb+ETnzF
-GcFbBhmpu87erqWslbkGp9Siy1CYWHIOSn04TwdE7ioVCPocxqPfN7VPpBQIeDKg
-nHURGhTUUK3I+VohcrHHp1Cu8j+ng7aKYvKCGdjgGDzH6vLpD4he3J16qNx9kBz2
-r81DKuqoUp0kq71Y31S++z5S2+ARnUlywV19A04AOzLjzU4dA3QUCM46aDdTcuD1
-7vsBhq+0mPOshuYCK0cjzUpKC4/R7vDSzckbjPJeI61WqAJLQ2Um/CmbEjVscLci
-4pZIGMWkyM3UqUAivoX6q6Ohzl+cCrIKpADuPTIdug94YBLYGeMHXmnAU362Sf+E
-JlWBQV8cPbq+W0gWCl7gajVTjI+aHC6ZJTglUxWMNHmC1l2s1gOQ/E7VoqJyfI6Q
-cMCNujWk91BiZManrmmOU7AYKCGXewtRqz7Dr4HWRMMjzpU6i+Kb4Xfj+AVswNL5
-xmNASpXKpv5udHh6YLZ3x6WLFAkmy9kAaHA+pTyS+2xQW1g+Nha6gbCxOh27R4+L
-GxkKAihGl226HP+m1oqX
-=SVi2
+iEYEAREIAAYFAlGeLGgACgkQL46suuyRem2YeQCfZWnVXSkUGaseVgF+gVhoPUT5
+1LgAoJRMHUGqkaZw7y2Ca82h1skiW4+9
+=EYlX
 -----END PGP SIGNATURE-----
diff --git a/mail-client/sylpheed/sylpheed-3.2.0.ebuild b/mail-client/sylpheed/sylpheed-3.2.0.ebuild
deleted file mode 100644
index b8d4cbbccc47..000000000000
--- a/mail-client/sylpheed/sylpheed-3.2.0.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/mail-client/sylpheed/sylpheed-3.2.0.ebuild,v 1.6 2012/10/17 13:45:10 jer Exp $
-
-EAPI="4"
-
-inherit eutils
-
-DESCRIPTION="A lightweight email client and newsreader"
-HOMEPAGE="http://sylpheed.sraoss.jp/"
-SRC_URI="http://sylpheed.sraoss.jp/${PN}/v${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd"
-IUSE="crypt ipv6 ldap nls oniguruma pda spell ssl xface"
-
-CDEPEND="x11-libs/gtk+:2
-	nls? ( sys-devel/gettext )
-	crypt? ( app-crypt/gpgme )
-	ldap? ( net-nds/openldap )
-	oniguruma? ( dev-libs/oniguruma )
-	pda? ( app-pda/jpilot )
-	spell? ( app-text/gtkspell:2 )
-	ssl? ( dev-libs/openssl )"
-RDEPEND="${CDEPEND}
-	app-misc/mime-types
-	net-misc/curl"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	xface? ( media-libs/compface )"
-
-src_configure() {
-	local htmldir=/usr/share/doc/${PF}/html
-	econf \
-		$(use_enable crypt gpgme) \
-		$(use_enable ipv6) \
-		$(use_enable ldap) \
-		$(use_enable oniguruma) \
-		$(use_enable pda jpilot) \
-		$(use_enable spell gtkspell) \
-		$(use_enable ssl) \
-		$(use_enable xface compface) \
-		--with-manualdir=${htmldir}/manual \
-		--with-faqdir=${htmldir}/faq \
-		--disable-updatecheck
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog* NEWS* README* TODO*
-
-	doicon *.png
-	domenu *.desktop
-}
diff --git a/media-fonts/mplus-outline-fonts/ChangeLog b/media-fonts/mplus-outline-fonts/ChangeLog
index f8078cabee27..f5b03e8ce525 100644
--- a/media-fonts/mplus-outline-fonts/ChangeLog
+++ b/media-fonts/mplus-outline-fonts/ChangeLog
@@ -1,6 +1,29 @@
 # ChangeLog for media-fonts/mplus-outline-fonts
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/ChangeLog,v 1.37 2012/10/08 10:01:49 hattya Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/ChangeLog,v 1.42 2013/05/23 14:37:30 hattya Exp $
+
+  23 May 2013; Akinori Hattori 
+  mplus-outline-fonts-0_pre052.ebuild:
+  ia64 stable
+
+  23 May 2013; Akinori Hattori 
+  mplus-outline-fonts-0_pre052.ebuild:
+  amd64 stable
+
+  23 May 2013; Akinori Hattori 
+  mplus-outline-fonts-0_pre052.ebuild:
+  x86 stable
+
+  23 May 2013; Akinori Hattori 
+  -mplus-outline-fonts-0_pre040.ebuild, -mplus-outline-fonts-0_pre043-r1.ebuild,
+  -mplus-outline-fonts-0_pre043.ebuild, -mplus-outline-fonts-0_pre046.ebuild:
+  remove old ebuilds
+
+*mplus-outline-fonts-0_pre055 (23 May 2013)
+
+  23 May 2013; Akinori Hattori 
+  +mplus-outline-fonts-0_pre055.ebuild:
+  new upstream release
 
 *mplus-outline-fonts-0_pre052 (08 Oct 2012)
 
diff --git a/media-fonts/mplus-outline-fonts/Manifest b/media-fonts/mplus-outline-fonts/Manifest
index 84ad6094bf30..d50a916ed01d 100644
--- a/media-fonts/mplus-outline-fonts/Manifest
+++ b/media-fonts/mplus-outline-fonts/Manifest
@@ -2,22 +2,17 @@
 Hash: SHA256
 
 DIST mplus-TESTFLIGHT-030.tar.gz 17620215 SHA256 558b3a7f2f6de6556d1e9727ca6f2dd1fa1d60f343f532d1012059d1c45e9583
-DIST mplus-TESTFLIGHT-040.tar.gz 24481123 SHA256 cd5e26ac3ed07d3426acc006abed4374b16a33241e5fb3494d6d32760a9cdcb0
-DIST mplus-TESTFLIGHT-043.tar.gz 29665544 SHA256 fd18833a8849ac099078a863bf5bb245b6099098d8c5fffebf58e6dd02f28acd
-DIST mplus-TESTFLIGHT-046.tar.xz 7856848 SHA256 6109d9c895c9f7cff0d4f1196cd28485e0a6918b25acdb710c5c3f1a926dcbc1
 DIST mplus-TESTFLIGHT-052.tar.xz 8302388 SHA256 a2e0f93e1eeb1d1dae5cf215e35df70de9d692fb3bb42eed85b9b9b590966220 SHA512 b135f4ebaac97540787064c89e8cf747317015b44d083ecec903b0a4c8bcac561ae99d7cf187119cec94199609810a0d63b24cc0991a5a42137304093d5c6423 WHIRLPOOL 862b2517d2712b079173e0f26240dc5c2a1517bb8fd4b2ba325d5ed10a20499c053f3e4ffe5f22c78c28205aa0eab6ba009d76f3185c0d7f130657b3274cceb6
+DIST mplus-TESTFLIGHT-055.tar.xz 8853404 SHA256 19b2139d69c7bf4397920767affa01d2bad200610147abbcd1e2d91b10017f4d SHA512 02846d2291e9d57b3b53fa433400fd4551361bb298c1db951606f24d3baf3853a656329df458b80f504876f0b88afa84c2be2540a2868fc578d94a04d616188a WHIRLPOOL 959747f0e1c3aa09bf494201bf3a34ac1bb407c399c9e393cd0f200eeef21e16a3ad8db8ff0dbaa69011c00dbc844a16faa9d945d5b4cd6c7ec4d50f8fe11ab2
 EBUILD mplus-outline-fonts-0_pre030-r1.ebuild 1053 SHA256 fe9d44811e62f9c57c6797b0c7c92ce3b1f8fcf7d94611eb6dbfd3326baa6131 SHA512 2cb466928bf7e6bb7dc3b9d51393be339a6bfc83c3cc2ed9a2c2575956307680f83ccb4fbaa3d301d276eae4bad72aaa091bbb9e085336ada3d3f5f0becd0615 WHIRLPOOL 6dcba7b007225a77734c484d1d1b50157562e1b0f30b6993d28aa007b03624c35fc2f4938ab864f2d3fb636d1068255980be39ead986afdf2beb7eb023346f8b
-EBUILD mplus-outline-fonts-0_pre040.ebuild 1080 SHA256 98fc0f59bb81a5c9b354cf37358058662127379a7e75474ecad44e14f088caed SHA512 a0ca36b4fb083dfc1be6e5ab7e06b1447a0d9088209f768c9efeb3a61634e6de50d54a36132e54b44642f59ec42557abcec44676ed88cc6b8cc341eb7eac48dc WHIRLPOOL d3ff4945b2e56cb6f059963f9fe9a0516cd731d2e458357df1d870c1c79f5a55adf97962fde681b3cb38e13710893f7dbe3b6c67c8d2b304bc4e26093e51498f
-EBUILD mplus-outline-fonts-0_pre043-r1.ebuild 1088 SHA256 5d7a63ce1f9a4b75a6603662dbc61b1b6d3b921c7e341f3832fd7c7a15836c87 SHA512 b836970d374ca1eb88176a480f60823c52e1d6470d47b113faebd734dd7d754a21fad6fd73ed3beb4b88a51294080530cbfda566a763fe6f0c1ea64a9e6d7421 WHIRLPOOL d159596bd4d7a8a7e8371eaf0c5d6fa0527af1f6179975843d1ffab14c2e4b352ac7b9d8afd00a518cb9d39e1f54329004e2f37825ea3a4c94e0c90555cfafd8
-EBUILD mplus-outline-fonts-0_pre043.ebuild 1090 SHA256 48c1139873a0fe34dbf79c43e410c65a236da645a09ad47d9a403d8b2ae36e94 SHA512 b8fa978b63ea623c6b25cecc162c0ecccc2ae5db6d5751b1ab73d1a1eb6247456388e35cd3f5ad2e9c9ae1d65b9ce839757adde208331229d75dc1fc24547feb WHIRLPOOL bcdad12264de2c9ffce5399d0dee3270b1ea1f78dceca93c1d3e986fc7d11b0bc2176043b148ee80ca80d8978d5d32a975b6f0d3af26d1312a77e08207e9ec8e
-EBUILD mplus-outline-fonts-0_pre046.ebuild 1086 SHA256 d710adde8f9f2a40b1adc9d49cb5d69a0606945aa88cb71aa112c15b445fd63d SHA512 83f5888bfef2f7fdb7bae984aecd7b72ab874a5f0c69205c3e8b140f402979b790f12f30f5be312e4f9704e0923ad6d510d4f17e3bb45580bef66dcac075b424 WHIRLPOOL 1e35c2851fb32b5c476e9b6502b6ce49f1383a8358e4960d48cb8fe12f9d958c39840a89feaa15916c05b3de6875bc2221d54750d2f098beed2e8f79c0160bba
-EBUILD mplus-outline-fonts-0_pre052.ebuild 1086 SHA256 b14067b83c33ef6550a3182d22b65a9729380ffb9ea7033a9dac1d9f85084cd5 SHA512 1bf726bcab8a94a12389afd64a0d7c82b20c22d2f9933c773d99a926945c9b20d4f9d1c574bd8ea1bb3cf684c8365991a86b0a1f5f3932e7b8f700fbd90c74b0 WHIRLPOOL bc58572fad40278a9f3ae85cef884f430951906c4ebbe8bdd1637a3bdcde4ec78af968a820348865cae018ed1d9e8ccb7b82412fbe89e88778dfac4514dc4dfb
-MISC ChangeLog 6597 SHA256 1b3ccf2a52c080ce0269afe6469792cc6f1e0b002354ff2ecb7a16a29e4589d6 SHA512 81a66fbedbc9b2aea4ee5721047d48dac644d6125f30a00321c9dcfcef5e1c19d1a008d00897c968e1adf65312f1e285d38933e6b9cd1364ad671ba4be4f7b20 WHIRLPOOL a6bee3579c206dc6b3e9d0e7e94674e8fd7c4cef9f80c2f6ec33b742d62f21fadd956aa7e052495f3eb9f1b1a2c61a3c44c9997e8e830995fab04221804ed0a6
+EBUILD mplus-outline-fonts-0_pre052.ebuild 1083 SHA256 a55e008e055d4184ed176ea344e1505387edbaad1c7e9361bad2e4f7e747f3a7 SHA512 31b33c03c20c6163fc1916b0c842b22504b310686838787cbee62041e491e4af4828ae6bcd9ac32c8253afc1e6882a7159fcaca62c1765fff6cfe2cf0975567b WHIRLPOOL d415f89264e8436b54274f5308e22163621ba9972e7974d3ce86b97b3b74b595637dddd1f93aed9ee86714ed609297f0b564fe77bd51d47d8e3693f9323c8c8d
+EBUILD mplus-outline-fonts-0_pre055.ebuild 1086 SHA256 38f6c04dcd4c0c51a76c030571546ea5b3b16122ca78e3a7a34ab73bd8a21a9c SHA512 630f32bfbefc81b138314f3282a86144245b51f484eb282c1a6c04a71e232ca91bb17d8422cf6b633e8787214209fbc3b76a1c59808e3776fb0eb9be8cc11bd9 WHIRLPOOL 2b33149ddb072314e3d5d2890188866f76d2b55942fa06191f8b85a52a9f47293a5514d0cda1c6c9ac93e21631fcf9361977666728c30425069723cbfdd84443
+MISC ChangeLog 7304 SHA256 6d633c711645ce1848e8d23be521b03bf32173d4ba59591f6205de0736346ada SHA512 bfc48ca56d7f3941e2938333d99b7f9434943c5e762d6e6f67148b6e45a707534152e93f9554583e9ca11f5af6ac0be411ccaaca4269156f23acb22a60f5b992 WHIRLPOOL f13df7a7fac402ae2e9928d3ffd04077133acbee194f4d7ac24f249a735eb119ed451823bedca49207752ca163e081b4719ad9fbf2f7e0f510a26dff7c76cb06
 MISC metadata.xml 285 SHA256 75c916c235e71f1c9f70ade5d259a3faaba30dcf8fb5cbfb2459cb21f937ddd4 SHA512 e637f3a989c8cdced93149686310cc458e35b6823efecd79e2852047da52ce6c4967645ba5743dc02324552711b31998e1f17bb7ce9764b1fc42a15d3b75c07c WHIRLPOOL 8ebcc5836ccdf91289f40ba505b0f16d902d176bd36a90a729956a01ca15eac0c8d30856fa224acb5e2e7641c18c12ce3fb194cf12fd61322c0ce29c1d5f12f9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlBypI8ACgkQL46suuyRem0T4ACffOWcxrzCiqKB6y3aoPC6wOxU
-Y2wAn0znBenGe3g9jQtc6w6GYHrQAZC+
-=7N+J
+iEYEAREIAAYFAlGeKcMACgkQL46suuyRem2HGQCeIfIU+E7j7cSYDVbzUZ2pcHMB
+nEUAnA269/lYk4zChi4fVEpPSyK82wAF
+=1O6R
 -----END PGP SIGNATURE-----
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre040.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre040.ebuild
deleted file mode 100644
index b285ba0e413c..000000000000
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre040.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre040.ebuild,v 1.2 2011/06/14 17:47:06 grobian Exp $
-
-EAPI="2"
-inherit font
-
-MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
-DESCRIPTION="M+ Japanese outline fonts with IPA font"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/ https://sourceforge.jp/projects/opfc/"
-SRC_URI="mirror://sourceforge.jp/mplus-fonts/6650/${MY_P}.tar.gz"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos"
-IUSE="ipafont"
-
-DEPEND="ipafont? (
-		media-gfx/fontforge
-		>=media-fonts/ja-ipafonts-003.02
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DOCS="README_J README_E"
-
-RESTRICT="strip binchecks"
-
-IPAFONT_DIR="/usr/share/fonts/ja-ipafonts"
-
-src_prepare() {
-	if use ipafont ; then
-		cp -p "${IPAFONT_DIR}/ipag.ttf" "${S}" || die
-	fi
-}
-
-src_compile() {
-	if use ipafont ; then
-		fontforge -script m++ipa.pe || die
-		rm -f ipag.ttf || die
-	fi
-}
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043-r1.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043-r1.ebuild
deleted file mode 100644
index 2ae5d8aa7fe4..000000000000
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043-r1.ebuild,v 1.1 2011/12/18 03:32:47 naota Exp $
-
-EAPI="3"
-inherit font
-
-MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
-DESCRIPTION="M+ Japanese outline fonts"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/ http://ossipedia.ipa.go.jp/ipafont/"
-SRC_URI="mirror://sourceforge.jp/mplus-fonts/6650/${MY_P}.tar.gz"
-
-LICENSE="mplus-fonts ipafont? ( IPAfont )"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos"
-IUSE="ipafont"
-
-DEPEND="ipafont? (
-		media-gfx/fontforge
-		>=media-fonts/ja-ipafonts-003.02
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DOCS="README_J README_E"
-
-RESTRICT="strip binchecks"
-
-IPAFONT_DIR="${EPREFIX}/usr/share/fonts/ja-ipafonts"
-
-src_prepare() {
-	if use ipafont ; then
-		cp -p "${IPAFONT_DIR}/ipag.ttf" "${S}" || die
-	fi
-}
-
-src_compile() {
-	if use ipafont ; then
-		fontforge -script m++ipa.pe || die
-		rm -f ipag.ttf || die
-	fi
-}
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043.ebuild
deleted file mode 100644
index 8caad9ed699b..000000000000
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043.ebuild,v 1.2 2011/12/03 13:53:21 grobian Exp $
-
-EAPI="3"
-inherit font
-
-MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
-DESCRIPTION="M+ Japanese outline fonts with IPA font"
-HOMEPAGE="http://mplus-fonts.sourceforge.jp/ https://sourceforge.jp/projects/opfc/"
-SRC_URI="mirror://sourceforge.jp/mplus-fonts/6650/${MY_P}.tar.gz"
-
-LICENSE="mplus-fonts IPAfont"
-SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos"
-IUSE="ipafont"
-
-DEPEND="ipafont? (
-		media-gfx/fontforge
-		>=media-fonts/ja-ipafonts-003.02
-	)"
-RDEPEND=""
-
-S="${WORKDIR}/${MY_P}"
-
-FONT_SUFFIX="ttf"
-FONT_S="${S}"
-
-DOCS="README_J README_E"
-
-RESTRICT="strip binchecks"
-
-IPAFONT_DIR="${EPREFIX}/usr/share/fonts/ja-ipafonts"
-
-src_prepare() {
-	if use ipafont ; then
-		cp -p "${IPAFONT_DIR}/ipag.ttf" "${S}" || die
-	fi
-}
-
-src_compile() {
-	if use ipafont ; then
-		fontforge -script m++ipa.pe || die
-		rm -f ipag.ttf || die
-	fi
-}
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.ebuild
index 22ba23fa51d1..d4f1de0670b8 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.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/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.ebuild,v 1.1 2012/10/08 10:01:49 hattya Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.ebuild,v 1.4 2013/05/23 14:37:30 hattya Exp $
 
 EAPI="3"
 inherit font
@@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge.jp/mplus-fonts/6650/${MY_P}.tar.xz"
 
 LICENSE="mplus-fonts ipafont? ( IPAfont )"
 SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos"
+KEYWORDS="amd64 ~hppa ia64 ~ppc x86 ~ppc-macos ~x86-macos"
 IUSE="ipafont"
 
 DEPEND="ipafont? (
diff --git a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre046.ebuild b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre055.ebuild
similarity index 88%
rename from media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre046.ebuild
rename to media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre055.ebuild
index 4fcc7678dd90..b9a3db2bc0fb 100644
--- a/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre046.ebuild
+++ b/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre055.ebuild
@@ -1,8 +1,8 @@
-# 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/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre046.ebuild,v 1.1 2012/01/28 15:33:10 matsuu Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre055.ebuild,v 1.1 2013/05/23 14:15:22 hattya Exp $
 
-EAPI="3"
+EAPI="4"
 inherit font
 
 MY_P="mplus-${PV/0_pre/TESTFLIGHT-}"
diff --git a/media-gfx/ufraw/ChangeLog b/media-gfx/ufraw/ChangeLog
index e9ad727a761f..9790acb75a14 100644
--- a/media-gfx/ufraw/ChangeLog
+++ b/media-gfx/ufraw/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-gfx/ufraw
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.111 2013/05/22 10:47:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ChangeLog,v 1.112 2013/05/23 05:44:46 radhermit Exp $
+
+  23 May 2013; Tim Harder  ufraw-0.19.2.ebuild:
+  Respect AR (bug #470622).
 
   22 May 2013; Agostino Sarubbo  ufraw-0.19.2.ebuild:
   Stable for ia64, wrt bug #470502
diff --git a/media-gfx/ufraw/Manifest b/media-gfx/ufraw/Manifest
index 723074749cc4..ff1142ec5209 100644
--- a/media-gfx/ufraw/Manifest
+++ b/media-gfx/ufraw/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX ufraw-0.17-cfitsio-automagic.patch 933 SHA256 d489abaa6da90a46f4b3b23e2e5400c1eeb7d2e5532835df4d5ad244167e7d18 SHA512 84aadb7dc41927a26ac37a801e136628380e79f032f87a925e737ec76c349c96c410750234f4870fe2fa61680085472a028e47c13cf01b2bd7fc7a55dad6de1b WHIRLPOOL 7815f44171243408468347a6acdadbda239931b2f2a810e4f0a8e98023506d9761e73f3db137aad7930dd5814f7ffcc2c670cf572d50caf394e88d85cafef03b
 DIST ufraw-0.18.tar.gz 1219440 SHA256 24fe739c61e9e14de1900008477c8662553e93427569c1d595556d440e6b9205 SHA512 3f1279b2fc9fe1dd19670a9f4e84dcbc9766de5efcb070ced006e6b7ad4956d7bc51cec437a9c47f1bbfbe22eb348c67afb8d6e5772e07a135b0c7b4abf2d7e6 WHIRLPOOL ec1998c32f6aab2402dc502d6150b09819e24b6ae06c42140930ee0bc746f49e020a7326eace92678131fc0fee92f1949598eabaff1a41b14f35686e69182a8a
@@ -8,24 +8,18 @@ DIST ufraw-0.19.2.tar.gz 980934 SHA256 73befe9f16f015a8c0f26cef3bb2e17cac9ae64ae
 DIST ufraw-0.19.tar.gz 1251852 SHA256 12d551418c5e69ae904cb92e9ac11b4d2e4327a857ee13ac890f34320eb58b9a SHA512 49268ca663758e1cb1a8fbed3ccc236f1c89cb8b609cf2dd946750af26159ef4387f06fd22f4da5d1e4a198355616288e8cbd5738dbfdefce92676482cbde1f3 WHIRLPOOL b2a460b48eedc708d8534eddadaef6cc0ddee5414da4af078c0aded1182b0787e7f4c699f91591ea03a916e34a1ff19e441d7ffd05d0c002e9a24a59510e545b
 EBUILD ufraw-0.18.ebuild 1844 SHA256 57d6e93d1645bd642e02cdc0b1e1e1bbfcd8b4e9e310ca827787eacf6c6990bc SHA512 34b21a40fb8bc01eae12dd4075136b68d4924a2c801d7db4db1e89009d03e57844cdec983e86390a8168f1e3d162784fed03cc101923f3c6dca74169d7e749f1 WHIRLPOOL 96ff6583f38db9336f31ba6d0f06287999a73897361e291099e5c5da498e041196c054e152937a18035745b4c714f56e9b5e60e9313bde2347b79f71e6af5e46
 EBUILD ufraw-0.19.1.ebuild 1796 SHA256 cbde8766f70df1c64a8fb386b9439b9265ec4550427e76a2d18385a244635939 SHA512 8917abc877fa2d76b70e551aac9238c250453b0acd71092c810849fe6cd01689e48bc0f77166004ef3478e657340b3311f81eb1617f1430d26f921423e3d9771 WHIRLPOOL 527067017727725d8d28b70cf365bb00eac75b851772aeead197a5b5c39078e975d3273815526d9181d10739f38c15e44e4f0735dea540f3bba9edf4fb8fbca9
-EBUILD ufraw-0.19.2.ebuild 1786 SHA256 db7ad30c564f74ddad06ea312134b99627a8a3b9146effa6faac11550326a1d2 SHA512 db79bd3f0cad908a765f6be6900ecea137db4f29725db0638d8efd5239b3c4d7aacd9fd81f908c386d515bb79507241dcf8f1c0e6fc468bff9be6db2251c4cab WHIRLPOOL 735502e6df7a5252bc501b8065cb6a32fe1c6b120080e4127d51aa0b3988766a8596a8a26782e588c6a76d48651527030fd5ef98f2f6cd53f689bf9b1a0bc91b
+EBUILD ufraw-0.19.2.ebuild 1851 SHA256 1a92e426f345b0f4bd710cd750d4c0d76c249b1955ceef1dc1a5a3c65025444b SHA512 c344e707ff4e87afb17d4050e31ffe552e20278c9dd9bd4dcaecd79cc09e4e5c80609a5f702f2cd389eeb7652a1a64152c9770df7a6b876030541224c393cef7 WHIRLPOOL 992ae5d818cddbc2f85612cda6c563489a221ddfe83caab495e0153262c32474dbcc63414e3ec1fdee9948abd165c77c7beca6c022265e90d03eedda31b2ea19
 EBUILD ufraw-0.19.ebuild 1794 SHA256 bae4f86201ce7a3aec151799bb64424233be5d17d7deafd4f200c4743fe31555 SHA512 5fe00da061284d7d6ae47bb8a19dbfdd40a4d83dde1b3d374e3c16beb7fb70c833f321e8abe05ac58d87cee2218228de627316ea3510200faea12f5b68ae6105 WHIRLPOOL f52b8d700c9b629d657a750ab72a7e04f74359b40ff8266645a8ad5a99af9c8bfe3c85e6119c9c614c537da0c6d88b3b41ea264d8f8598c2730604e27ea60de8
-MISC ChangeLog 14352 SHA256 c8b1bb311a1ce8d9c70055b4e5b5d4dbb602852f22a467f2bae8d1991d49be46 SHA512 386414181812a1f484e7d0632a7fe80be0c88bfe6192bd72106a55ad68080af9f7b1a4a738b91369131fe013dfcac9882f295ee93c4fb6b192acc24d4b165b51 WHIRLPOOL 611523e4662adb0de603d5af752c83eca264f41fea1a61ea66ab5d68bfa21f78a6ce0c4a56d3d12958396a3cdfad1bf092e2daae1c4d6f742c690c406a0c7750
+MISC ChangeLog 14457 SHA256 7bff46fe0eebc11884ed027b46cd43d98bcfff8927ad5b22118d3d90a66d8eae SHA512 63177a6d916172733334c6723e0d2c983d49330904d5595ff78211ecf50d75abb34307d10a3f96d07d895c19f32af3fb7b2ddd8f7f064ce52297849a5a51c20a WHIRLPOOL e04fa7ad0b138841873a1df21d6c397aa5e7f30c0a2a5eb786afcdef9f19e3b874d5d3bfa3216345340566db97393d0304c7d44332c5325f84bcb45a25ed98bc
 MISC metadata.xml 437 SHA256 101562af2e68f9ce05d05494d48c03aaae046560eab55d6c5d472ae85fe3e4bc SHA512 be7071c107a374d39fc92eab5b1b0ca0be19dc3ec847241e7bc56acadca27d0bbd803beaaf4a40f12e44d581642d5338a65dfa7d37f78a3d75bc756ad6782446 WHIRLPOOL cab4d10b64bc1fbb4c2c72ba3d63b0ea46033bcd371472401e703304d1e6b76dfa8934e02192047b388b772da2af2dddc343067e225a1bd882943321524a3f3c
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRnKGjAAoJELp701BxlEWfRxcQAMcOTvtyB/Cd+pnulm+XzZKM
-6x6UmJ3+dXvWI5vmhTpdrN7uq5qL6y/nR58lp+1y3HQPZBsEm7QZ8LESuaXB4FDL
-POMUs2p8xZ4DV0t9/m9NgICizvkBZfMi2aSdzDmT+pUkrRJ+XMHcYFo+5vmfEMlj
-87UMuzJIjzhoHxo9iB4SkW1zHeRemAvPGhL+rpz8HK9DR6hH4pgIQ44p+ejfhhU6
-KajC9VZI9m2LIMt73cb5RueW7tQ04mK+SZrU3TaxMUoCVncrlCVslQcJoqaK7d+E
-BDl8xSgXd5QrNlgIL5e1lNFMSUwYI77RsgRpPj/zsf0wF2qTLZDPrNcrMRbcbj92
-eMangK/eqr88HmON0cwM9SEotO0cVGHSPd1v1ygcukD13WdLKrpgQnFD/OVysJb/
-W1tUippwOl9jzO/6ooDqxURB9QhhtDj2D3c8G8q0TzxdFQH3OhriCzfqw+D+VcET
-2/3lnHtGR3b/JSwfKUGqwGlwDTE1ltLVouzoyb9cq6Vbc9bJF54IYN0Z5WXE1Kx2
-HnnidfXvuBQjgPaLNGcNfC7CEBzu5ro7vCOkw2fdNGVFng6s331K4n54OzDBTIpO
-/nRfPrryV9Pk4+3Er1p3RkgVlsqpJCqOzkVvBODcVvLXZIlc4DP+Hdh/nU4QtlF/
-3Q/TTSqGGtH6mJqPR/tC
-=llUt
+iQEcBAEBCAAGBQJRnazSAAoJEEqz6FtPBkyjX5IH/R+n5FTQAsFLzOAqDQGd7++y
+hqp1ob0SdS701kJrRHX9V6EjEM1k2X6fcCKx6V/St0VO8I4E9UdKgMeW/m1gRGXw
+c4W3zgzZ0iEq0sRKqc2RJ+4KsNmPw+p14Lwh5aRivbeggnZEZTRKY1v5+5coZNk8
+Aofg3xB4hnYgCCWLXUOBdfYxpLtOsuayZXTRxrJmGlCo6B8pwx6aCmDqlQA5kpcG
+mNgKacg/sG5KfdsUB8xpgo1l/vDyrKuJxAOTG1WvJB1vuyuL7U+6BFySf//CtIJD
+F7J2juBbrqEYYCA6Zbpgcre1WJGIi8O0pq8RM2nc6jlAUHqJBYdKHPj3rvLnagI=
+=9WDG
 -----END PGP SIGNATURE-----
diff --git a/media-gfx/ufraw/ufraw-0.19.2.ebuild b/media-gfx/ufraw/ufraw-0.19.2.ebuild
index 3d74e9cfc10a..15410ff496f6 100644
--- a/media-gfx/ufraw/ufraw-0.19.2.ebuild
+++ b/media-gfx/ufraw/ufraw-0.19.2.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/media-gfx/ufraw/ufraw-0.19.2.ebuild,v 1.8 2013/05/22 10:47:37 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/ufraw/ufraw-0.19.2.ebuild,v 1.9 2013/05/23 05:44:46 radhermit Exp $
 
 EAPI=5
-inherit autotools eutils fdo-mime gnome2-utils
+inherit autotools eutils fdo-mime gnome2-utils toolchain-funcs
 
 DESCRIPTION="RAW Image format viewer and GIMP plugin"
 HOMEPAGE="http://ufraw.sourceforge.net/"
@@ -48,6 +48,10 @@ src_configure() {
 		$(usex gimp --with-gtk "")
 }
 
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_install() {
 	emake DESTDIR="${D}" schemasdir=/etc/gconf/schemas install
 	dodoc README TODO
diff --git a/media-libs/libcdr/ChangeLog b/media-libs/libcdr/ChangeLog
index 750e94744fa8..b928035b9f2c 100644
--- a/media-libs/libcdr/ChangeLog
+++ b/media-libs/libcdr/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-libs/libcdr
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/ChangeLog,v 1.28 2013/05/17 14:31:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/ChangeLog,v 1.29 2013/05/22 15:30:43 ago Exp $
+
+  22 May 2013; Agostino Sarubbo  libcdr-0.0.14.ebuild:
+  Move KEYWORDS on another line because of ekeyword's failure
 
 *libcdr-0.0.14 (17 May 2013)
 
diff --git a/media-libs/libcdr/Manifest b/media-libs/libcdr/Manifest
index e9f34edf25fd..478e19c3f3ec 100644
--- a/media-libs/libcdr/Manifest
+++ b/media-libs/libcdr/Manifest
@@ -1,27 +1,27 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST libcdr-0.0.13.tar.xz 570080 SHA256 a14bb9a91f667616aac04d5d02f8e0cca02a49baa988906ab8d80a787eb918c9 SHA512 70ae9ea6f4b60d34b980cacc33159abc2ad400ed9cd75591e75646f546947c0c4c7cb6b715c4ce947916a8bef49a868fd5a4be1c726bc25838569d22b6b45831 WHIRLPOOL b095cf162592c0c83e9db432bd6e739afd7e4e618e0e589f8aa5b8f00d13e3bf1b28447d18f3236ff6cd6a6bb648c7ee0087d1eb2db376be3c0c0447eb83ef44
 DIST libcdr-0.0.14.tar.xz 570728 SHA256 720b693ba5e777f099f41ecd40418a16674ab29d823f7d62a23be170781dd8a0 SHA512 08f5cdf6926f2305ffc24ca7f03709c4f6045ed6c3aad15bc524b8c8d6bf1b873bb8bf9acd39ca112f0f51ba5324f1cf6a72d2f04ec9139d6c61a58a337a92a8 WHIRLPOOL fad944466269e1b8794fa7a3bd4ab471c5b0ff8cf0122c9eeaf109f51ad7092334e326c7e60c0ef1a7ae670425e2a5edf70c742bca9fc8c52a042322e66e058d
 EBUILD libcdr-0.0.13.ebuild 1182 SHA256 f9b9e9571311516b32ac8feac3738dace2c76ae08cbe6963f35963409513361d SHA512 9798dfbe6fc005d06250dbb9bfb074db2bfe8b58dcd5bf9f2dd31641d5356dda86682ca5f8fedca429181910e6ace15303538ed9809d4c12030160ebd88d62fd WHIRLPOOL 1bff7714e48488743ee0ffb6a643ccaf0b4054a670967565007049cfa169e799065484858d3adfdb3633bdd434ea2c2bc33418687d77e1fbfa40e0f28fe15fea
-EBUILD libcdr-0.0.14.ebuild 1189 SHA256 8aa2122ecf2930c4cfc2fa1541f8b9989ead1e623130bf455db46fcac41e0f81 SHA512 fdf42cad3e7ebe0a343e9862d25d8c504f9fa5cb59e23bce525673cec8a4aeebe733fc3f1a528c232d35163fd19adf0f6dcf90952d0ad66768831b666734e198 WHIRLPOOL 2d07ac1c211866748a71dd7043600f90f12dbd45b270fea43b9c40d8e25713452a9e9d1259043ee656550982f9abc90d6a840c0613c0d8bb468baa4d7b74d4c8
+EBUILD libcdr-0.0.14.ebuild 1186 SHA256 bb507de7fc42072995aaf6eda121268977145e6318b2814a94b32f14f286cfd5 SHA512 31440a16555747dbeef3ced23b73b923c330690e80045b26381c2981eede6b27a3364ca2fad13255939efcc6e82d1fcead20458d3a58eb5b90f4389dc62d2ec7 WHIRLPOOL 2a9dc075d9952cb817710b024b206113dd702e19fe8a7c1c6c7ec9154f406199974fe760817108e5b83f78fd42091cff1fb28f80ab6588a1366b395e0939f259
 EBUILD libcdr-9999.ebuild 1188 SHA256 98f64da132c62ddb36858e3e9aa147bacc1fb06078bda877e8006612feb40dd9 SHA512 b121fdbd612d88788890a901fb52fc9fc8dd990bcb54705e7a38400e70db601ae47db190685c3e8c6993b522a420d6e4343da2cf917eab83705107a47ad071e8 WHIRLPOOL 8f27cf1430ce306266611b433418a4d574ed5eea721988c58273cb2e38612f743c62b7d81db16cffded24e7879f3b42e40a5667caa9f4b5c5a3c134abb14897a
-MISC ChangeLog 4228 SHA256 453c4dca834e33527152a8ec92308da4a06a224aa636fed6375d26f2a88d69a5 SHA512 4cbe34c855e9864b520b3813189d2c8e22388e68d91a23d7aa15ba83616c2d1d2f495aacc7cf6b8024a1ac6d4f6b2aee6f5b7201f901821926363df3eb665db7 WHIRLPOOL 1140bb0eca0961c1a47b30a50ee653583783dc420ea833a469ffd17ce7a573dac2db5f314a01ea1ace599a0a12f74474ff4c1b5b67d4706ea54fe30061bc1efe
+MISC ChangeLog 4356 SHA256 3a71902a02fc9397851ffa865069b1016d6d5e401d8d2ded72aee463a74e8843 SHA512 8a74ffc864c8bb0e0436656878c40950ebabb8a39640f2ed8bd3b1899690c614b2f1ce5503df89e1745e48b5aeec52684bc99442788f70047d39137650d8c9b0 WHIRLPOOL ff9c28093f440d5a312a857bf299ac9ed71cf054f7720fc77b3319bca88fe6e6d7f1aa5a6407f3297ff5add3d9497d8434d2219152bd7d6ffb767e3d81f4492e
 MISC metadata.xml 164 SHA256 6dd077e0a4bddf8cac0a6d7fb01d5f992a81c85d77d55787d19c6d4ae4c5aeeb SHA512 acd8ec5158c34fd738af175dda4c270a884c80e76dd10d9252e2513846ae1cb69ed8b1afe328a69ced10974ca3c60366394990b98a0d9b9815527f262afd9937 WHIRLPOOL 43b43d99d3c96c6da7006df219d57a4ff853353940dbd597bbbd2be00af7b38f0e6c3e33024b1e964ef1fedb12f788ea78693b7e3527011d8bbb9757ec0b88a2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRlj9hAAoJEOSiRoyO7jvokekP/inw2TmOKNtQLETk7saZs6Cm
-T/Ezg9B5mQKLjKPQHl3ONd4At5L6AQcbDBQZKnlsoQd4jEPUHFbyPOuCd5fayLgy
-xozoTspNFBynCie6pS+7qc77+rqN3yP88p8h4HTbJEwbjNWQ/51xQ7bxOsxyubSi
-mnyq3N4kgUCjPNDUF1khfF4XA7DxcJSIgdIeBUoM+CH5R9EUTPsEW84kIfYYyzvU
-I1/6puUOM/+BEfAA2VxIdxla5Hh8U1rB5roPIUUydggOZj9F4KheSyYP8VeUoMFH
-ctZXDfh+PlgMbZYnIWfH4J9AjO8RaHf+g7Qk17Ktjz7Pp6JIfLwkGYnMSiTMEVFG
-XdYE2XRb0SEuNQR2GR0Oy+Iod+OiqoIN4cn0eLUEYby/XuaaEYqji29JwtrJN4ey
-CsQXroawOvj4C9y5phOIBhR08ge0D/iMGI1U4kDePqNQ5XdqZ2q/f31HJQOVdnXp
-hcZFx2ckMD2L1u4ECzEBX048Ciam6BteIX3NyqZgOwwlmR/NUPXzQBiz0GmBwGsC
-u2nrDG4r4YUD9yR1pSLzBC+2XqqM0cYFTQdKCSs5RpVIZC991kZ4my2jh8ml1D2w
-QbkGU4gXQSK5K61bWg7AL8187VxWpV9OMAO8ASZ2tpX85qS0QcErJr6YZhzM6asM
-2y45744nb6Z0S7SEgURi
-=KRXr
+iQIcBAEBCgAGBQJRnOSlAAoJELp701BxlEWfea4P/015Pg0/aKmFG0JOpR03lF3l
+qqctGE0Yl7aGMhiyW8FNJR/jiPJkd7E8YbjBKvsw9JdAMIGhUOD1uKJVfhQ3RCnW
+m9t3EEhuyw7v/boxoh88wgAg+x1ir46jeLnKhJ7gVi2y4mPAaBqkRcjuN6ZWaXF4
+oHxv+ucG+sqoHyyqdKS9qiEGzu8f6szVPRBngUpoVaaL+bVhYDeRivRAD70JAzoo
+IrMcK3MeJ9N939CzHnU24iIq7Chz+cEZCfnLmy7/uU6nK6UwhHJggQ6CGLgHl82k
+IN/smdSG5DFoETyOJ5pYAByY5C+jcd08uwEo1ZxVlsEblIE/19KDOxTZOJ3RCDPb
+whYOfTqadvHG1+YuFPBOyORvjMjcevg3c6OOrKUB0OfZhs1b3wX/TT0BXsx9zIFG
+0MmQeGfK6u+uAfX3XSE6PL+a6UqXo3WGQ5OR0uAR+cC2ZgconJ4t0GdMyJPLOKon
+htUu6nrebevJ9CfT+FhqPmP3szCMH9q8Eu4rF27Gsj6Y8IbV5oiKNEgSMqPr+NZV
+Fds1+8FIbUPzyOsDukhvOUkGGvj2U+PYkyVvyCERwKRyOEFmRMNSPtGgmrCOF+3Q
+37FlpN5Z8BSOrEgHdiyiK6acICYZAz6vpd/ZSr6VKhyy/2nec4Nqt4uLnWJKSNSa
+eqwyOeprrdbHo4lLHnoo
+=HeDh
 -----END PGP SIGNATURE-----
diff --git a/media-libs/libcdr/libcdr-0.0.14.ebuild b/media-libs/libcdr/libcdr-0.0.14.ebuild
index 278b6f235366..09d70d7ce440 100644
--- a/media-libs/libcdr/libcdr-0.0.14.ebuild
+++ b/media-libs/libcdr/libcdr-0.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/libcdr-0.0.14.ebuild,v 1.1 2013/05/17 14:31:44 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/libcdr/libcdr-0.0.14.ebuild,v 1.2 2013/05/22 15:30:43 ago Exp $
 
 EAPI=5
 
@@ -14,7 +14,9 @@ HOMEPAGE="http://www.freedesktop.org/wiki/Software/libcdr"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-[[ ${PV} == 9999 ]] || KEYWORDS="~amd64 ~arm ~ppc ~x86"
+[[ ${PV} == 9999 ]] || \
+KEYWORDS="~amd64 ~arm ~ppc ~x86"
+
 IUSE="doc static-libs"
 
 RDEPEND="
diff --git a/media-libs/mesa/ChangeLog b/media-libs/mesa/ChangeLog
index 5f307d9be94d..75582f59bde0 100644
--- a/media-libs/mesa/ChangeLog
+++ b/media-libs/mesa/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-libs/mesa
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.473 2013/05/15 18:05:08 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/ChangeLog,v 1.475 2013/05/23 15:24:24 jer Exp $
+
+  23 May 2013; Jeroen Roovers  mesa-9.1.2-r1.ebuild:
+  Stable for HPPA (bug #463430).
+
+*mesa-9.1.3 (23 May 2013)
+
+  23 May 2013; Chí-Thanh Christopher Nguyễn 
+  +mesa-9.1.3.ebuild:
+  Version bump.
 
 *mesa-9.2_pre20130515 (15 May 2013)
 
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index 63ee38133d9a..4672ed1bf2aa 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX eselect-mesa.conf.7.10 1670 SHA256 3ff15cedc353feeb2da450533c2ea2efc33ed1c8434a7b3037999c4965907149 SHA512 c62679e2427b6e922a7c04dec7afe1eddb4f8ba255735479338ebaf6da7db4ad7c6c916a3cf62da8bf8d2c0ceb60b6d591f8e878d4add9b7f63ff8121bb610a2 WHIRLPOOL 5d3522f8715ab62c9a1b4a96031db63734a98bb9e8a1cc722d20e018e7eedb3ffac92bb7c727bff1f58e216476b0e20552373b8155a51954f3d9af704e830782
 AUX eselect-mesa.conf.7.11 1670 SHA256 448d08e97e931563aa2e33f22feeaf911caf9a2eb9fd7b446485311d1dcc1225 SHA512 0a8178006f64d2f2d41f0f1ffbceab959ad66ac9142e2f74b593405041ade112b68fbabd54915c21dbf6bd7e3564499e6f76c348e8af632d751409b070420481 WHIRLPOOL 5df8041475f506ed544afb4b7ce94a31b4974c6cd26fd5054a6c29dda26cbec1694d60b68e975106d0797ff857764a39ec820da000e454be34181112b201ae36
 AUX eselect-mesa.conf.8.0.1 1622 SHA256 a7a4306084885dc624304a8893ca4f5645f7f1fe31322f9fb663e5a103f69221 SHA512 58eacf1304ebaa0116ea3c53fafdddb8c94738e31daad8546ac33b46dc51b81a6bccb48c167afe792c7fd41ca5054d8e66123f524b0623ad3e603ed4872f9dc4 WHIRLPOOL 7af55e3cb9448f4b3b4c463443e078a5559588371767e10b5890918d84bfeb16797f11ffabf9aaa205db70c550c5dfc18fe709b3a2e00746d93d4bf4944124b1
@@ -14,6 +17,7 @@ DIST MesaLib-9.0.2.tar.bz2 6132857 SHA256 75bf31f26c6e7b5515e610c1005fd1be1f7eeb
 DIST MesaLib-9.0.3.tar.bz2 6137208 SHA256 ea940005b2c379f83527b5ba6d7fb69c533c2c17b561dc3b8469237ac75606a5 SHA512 2685706670356ca82c36a9fc30bfdabe9429e37ba670ece4a44634222430f828dfd5f15b116d78e3a9a6c432cf6ee3cf3a44bd132f896b81cc0bf1e1076dfdc5 WHIRLPOOL e0e4d867de8bd8c97f25e10cd6aed6c5490224e25cc6413b0de0c7bfa4112e5f63d2aa135a3d3ea028257d1ad0340e1a69f38c270eb148ce68c8fb7cd4317f58
 DIST MesaLib-9.1.1.tar.bz2 6122510 SHA256 3ae5741918a26ce6457b4427663b9e0ed31a3cae1b10b9009e55769a52e9adeb SHA512 3a0cd1cc71d44b78f6a99536acd1eaa50d56a5ce26d0a247bde8f3e52e02c61097c23d26ee358dc91a4876cbaa14d0bb32c23f04837eb09808fd5fab842d154e WHIRLPOOL 22bbbeac8fe6a7f6c08401ffaee166380b4c0436910bce167eb6ec171800ce5b268f04c0ec72013c001b8b56fae562e57796f92e19d86f06da528f1b83f28392
 DIST MesaLib-9.1.2.tar.bz2 6122642 SHA256 0695115f7a900624db9ade4f5bd32f4b885d9273eed020fb12b7e29a953143db SHA512 80a09c76b43ad039d8d577f0d9e2b33038847aa8815a1a5251badec626dfe2e7b4c0dfa445f8ce388d4af052147da388ebac0c3265f48e42e3fda4147bfaa578 WHIRLPOOL ea5fe473813111ae08d64bbe9183a11454449ccf419cc689f644afc127ce7b1fd8cb5344682afae13f7db0a2d1d3b90ae418802805d4cee2f6d46d1d26953d1d
+DIST MesaLib-9.1.3.tar.bz2 6123010 SHA256 8d5dac2202d0355bff5cfd183582ec8167d1d1227b7bb7a669acecbeaa52d766 SHA512 c319f5ff8143c9ed7ee7a643c9ff5950e7f847d5a542b267c9510686c1a978f9b0b1a00f496d9d980ab3ba591aca16c67e40f6eeedf20826f406eecd77dcc81d WHIRLPOOL 6b91d4810104683bb64443cb380bd98828e54f16cd9a1ae6c8cd13fbafe143556eb559c3bb7af914b78f82e4bec4d492ef6e49136d4b5369edbc4b9efcfbb733
 DIST MesaLib-9.1.tar.bz2 6125400 SHA256 af484cbfe7fe26e62fb1ddb1204d608c4270e74364c44e7207508cd736a0707b SHA512 9475361e3e3ce0e8ad632003b6e41944d3750de3d5a1a774a2e9cb1f04fd0df8f27e6f47e31f08808c3f4506f683cbda53570617f1db1dd0657b07e4bac36a19 WHIRLPOOL 09488fc64f72818cf4baa3acb9c859a230e400749273f287b03645bfbc4679969037ad5eae1504de595becfd35d533fbdd6a9b37cd9aca41d62c2b9bf28991e1
 DIST mesa-7.10.1-gentoo-patches-01.tar.bz2 5488 SHA256 31cd4f6d1a0a70249c40452919074856d120cd473a01a8457e3dc147a1b622d8 SHA512 c62b45b32e396e67f629003fc5242b7b4df054b8e20b5237489212bc4f0171534915a02fc9efa68965068121d10660b5cd92a419efabe33fd4596a97a39249c2 WHIRLPOOL 5f171959e3a31f5c38438b4806ce371bb8fdf1c7a87501865e4ed5d5ab284cda9568b7773005997d7a1cff151f95e64c027b36c0be48a4dd288a7ab8b5f69b97
 DIST mesa-7.11.2-gentoo-patches-01.tar.bz2 4021 SHA256 e1e29d335f7e0c69824041a92b1815cd4e2defa4689285c86ea59d47a7ef407b SHA512 0dcd60bd40efa25c9895150b6c0230e6582ff42ba0bafae49290e170948ee99ff25be321e7d3d503b3f465eeedcd145fc46b312a54d9bc4d3577fd5e61c3439b WHIRLPOOL 8a4a5c250430ebc08d7081158c6cc41ea7b5718662ef0327e5829c2f26069be0bed7a0df12c82434c58d364926404c929ca9881847554b74906db195b12d6576
@@ -29,9 +33,17 @@ EBUILD mesa-9.0.1.ebuild 11109 SHA256 72524f5197094110183f9fa7e707e785f0eebdccba
 EBUILD mesa-9.0.2.ebuild 11119 SHA256 4793172450aecd72f796de7b2a5578a89b80fcb04730e2362eeebc845daa04c2 SHA512 b8769d558be510ede9db5e1636df4c995cad04969b00c1138e14543fd5fea34c65a36b5312366e2ae3e912eb565b73bdb4b9734d6132a9f5c6ce555d03a1527b WHIRLPOOL 0dd45f88823e792bf654c32bc99a14add8db9da6367a58241a7c7262579652f1339e24ee94e8d8ff75518486c398f495169280164311ef4f1b3c753f115a0b68
 EBUILD mesa-9.0.3.ebuild 11090 SHA256 9f37e3e2daee8874d05adde22958ab2ea300ea6d4c9b92412231751e7f821618 SHA512 a9bd9b257fa808b2c2467ec1f5e0f55dbe9ac86e618edb27530e44fc959ca59a4b4f1e9fde873be46268dad96a2b57abbb84188735e85bdaf880b6e5c58ab4c6 WHIRLPOOL c04c35068948adbcff61ca538611d828611652777f3f3c5d644150fb8fc52a68c396e93ec1ed18830368a6808c8f2128061256c6b4f3c6dba48034d450cc7f58
 EBUILD mesa-9.1.1.ebuild 10990 SHA256 95e5c318bde526b82c419737bc73d451be47357a1607ce6faccc85a1c729256a SHA512 0bf60745a83c931eb5b208460f4460f58b0081a32a463b1940c54a061be9917aafc6e6c88d8f1c1413a8802939912e5a74c8557cc163b4b918b7a430a06bce92 WHIRLPOOL 0dc3faeca905e87d25b426d3c5530cfe75865151699a53eb5e30f52c504bdd5554f33c27eee35e96fcf16212f069820bed1cc2f3fd06e226ab234af1b3d876fe
-EBUILD mesa-9.1.2-r1.ebuild 11003 SHA256 59395fee2e217f55a5fa72ad52e0854ddf02e6484191fd2de387a2396fb648bb SHA512 54a148d0d07d771f00804da6c5793195723d1d041d574a5ac95e7ad3fb35ed3a692ffe67e9c27eadd97f795def85fcc7464f02bf0baef97bc2f6790c4eaaa2e7 WHIRLPOOL 4e2c72b08d7c3e66a88ed703ae8701a61c3ab479acc81a69898bce5823783c3d71efc66babc98e79a89d19282fd9bd051a6c56fcf191cc6e21d3e560879626e7
+EBUILD mesa-9.1.2-r1.ebuild 10997 SHA256 8a7f8b41a06f242910d34125ab3e5f02481ace8381c531f6c66da53c208630dc SHA512 7127d193750de917b750a561d007bfdbb50d97f7d59c7d9c7f2f934b15ad3696cfb00624530d77d48ace4c116a56e2e72181dd185ea0c2b51d883b6a1169a1cd WHIRLPOOL 5e6812defa58b04617c3db58847321a8ab575aed2b50cadd48c54564291e8b380a303d283558ae04d704ffc5fb2758ab46006e95152baaa43a01724cb93529cc
 EBUILD mesa-9.1.2.ebuild 11000 SHA256 a6ffe032d225f5e0c4c437dbf3dde3fdfdbc73ba183ba69e88e75fb9a470e07a SHA512 f6104ec1c8a897f1b09bece843a13533c2dcd9971100e104d619bd39f23d89d2a1fcf5fc7bbb569c68557d0d98aafd9fd59dfab1dae48cfb3a68a16b0784f74e WHIRLPOOL 100625331ff49721407ced8b0e69dbfc282850319a0e7fffbc1833ccfc2a776348872bee2c597ff83c474b5051e3d51a0718473e108293963f0cf6a990f7a2ac
+EBUILD mesa-9.1.3.ebuild 11000 SHA256 1943ddf47e9e32ff342476b3e15b6d5f603e3865eee75c6362fd26a02cde1def SHA512 6ca24791b52200dcdb92e38b4d5ef616cb32ad12973f64a43ef6f5d3a704d264859cb97c2067fc3242df130fb87514c7dca339dc8300284e66bca9ac44f38210 WHIRLPOOL eda45b5d28e99612fdd9e1b2df240eede16d42c5912bd95baf1f949284135828edd1922f839a24278c026a2d21913755f6fd513ebf6934ac8eb2129fd7807535
 EBUILD mesa-9.1.ebuild 10988 SHA256 97e819e9c0b614157c773b9d0209ff66b1a3af4a28a7437f4eb5b1feb44e981f SHA512 71c1654787e4b6cdc925eea13901687c8ca7333766c629e236ba3deb46eb0ff063dc8621a0d3fe164f5d3b80381efaa2ff8ccf40268b4ca346da115d903a1516 WHIRLPOOL b6e8fe21ed317b23e24b2c9e2693820906e74c3593f1b1d0f9f65cb3154a2d6dac96555616be629be8ad3a059ea955198703fa91c1dfb676187bae173351f8a9
 EBUILD mesa-9.2_pre20130515.ebuild 11022 SHA256 8a6c728eb4814762511c095133693c67e6cdb4d8a660df1ff3c6eef117baf412 SHA512 c48bdeedf222ce0478456272747711fcb8093f0163638018e7d211413d6e2d16c152dc5234cb3ff778ba6426f9596c53722a175ae754f152121a77bdb0a7ea89 WHIRLPOOL 97853466baa061a6a291aca8ec09bed14dd9c29c5c70f2341f5af1dd3d1605cbd861ea1eca86028429bbe1122318dc2936cd4dc406fdabbb7d8739b9df8903e5
-MISC ChangeLog 77183 SHA256 5a3909d7ee93e1154b581bf88ef7a2c905cc6d03821239f7aeaf843bd7646335 SHA512 ebd43a34b7f6c93d91f73d6fd57fb236a29e9b705d866385cdb41a377caf204fa987d85b93f8a3ca40f1e36532101dc75996557eb6f32060de2c622f319c4ebf WHIRLPOOL d394fc60e28ead0067d6dfbb89830cd96eb17e97e0b751bb4a2d5904f6cd3746162c736f54f07e076f3c4c39147b1b2af0c411902a2caeafb99d798fa01050d0
+MISC ChangeLog 77416 SHA256 af88de49446ed13772c7a52319bcba1cda68d1919da0df48dc691dbc0562c3f2 SHA512 e38267c781c8afde6f06fd55ffd715afa4f15ee4e199e87bab47a8fe928568df028ff829f6ea7b069fee998e8fcf52e3913182d81eb9f72334c8d1f74465dd75 WHIRLPOOL 3d7328e8d32b5e7fc0b4458301da11e19695b66042d8d8adf31162851ace1ff308b7e4ea051601ff197e7ddad4103ecd9a0edb807eea0dbf63e0f02f44223f0d
 MISC metadata.xml 1986 SHA256 7a518f3eb77d4b51d4dc5c5cd347bebdc2c849e43d17d1057afeae6be2dc13ad SHA512 1dccfd236b8b8e39560d5056281e774979cd8e2299623b34c2e0f0d9e1ae84906932cfbc0ab15bdd1effc1d82cb484ca4d23acf7cd8d849a33a82f9ee2c60b90 WHIRLPOOL 14e19a3782775f7ca600526f1bf852ed55e328585b7e095a8ab239697ca351f812bf914205166faf714420d179ac7e36b6d1b10fe74188a028c580d40640e31c
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGeNKoACgkQVWmRsqeSphOCbgCfRBCtGqkOLN7JHYbKoyb8o4Nd
+n58AnimJAfE5UIwByjM6oMvauHheAK4+
+=dUER
+-----END PGP SIGNATURE-----
diff --git a/media-libs/mesa/mesa-9.1.2-r1.ebuild b/media-libs/mesa/mesa-9.1.2-r1.ebuild
index c6b72911c169..83d04c9289df 100644
--- a/media-libs/mesa/mesa-9.1.2-r1.ebuild
+++ b/media-libs/mesa/mesa-9.1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.2-r1.ebuild,v 1.2 2013/05/14 15:25:31 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.2-r1.ebuild,v 1.3 2013/05/23 15:24:24 jer Exp $
 
 EAPI=5
 
@@ -38,7 +38,7 @@ fi
 # GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
 LICENSE="MIT SGI-B-2.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 INTEL_CARDS="i915 i965 intel"
 RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
diff --git a/media-libs/mesa/mesa-9.1.3.ebuild b/media-libs/mesa/mesa-9.1.3.ebuild
new file mode 100644
index 000000000000..aa96bf977597
--- /dev/null
+++ b/media-libs/mesa/mesa-9.1.3.ebuild
@@ -0,0 +1,418 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-libs/mesa/mesa-9.1.3.ebuild,v 1.1 2013/05/23 00:29:18 chithanh Exp $
+
+EAPI=5
+
+EGIT_REPO_URI="git://anongit.freedesktop.org/mesa/mesa"
+
+if [[ ${PV} = 9999* ]]; then
+	GIT_ECLASS="git-2"
+	EXPERIMENTAL="true"
+fi
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit base autotools multilib flag-o-matic python-single-r1 toolchain-funcs ${GIT_ECLASS}
+
+OPENGL_DIR="xorg-x11"
+
+MY_PN="${PN/m/M}"
+MY_P="${MY_PN}-${PV/_rc/-rc}"
+MY_SRC_P="${MY_PN}Lib-${PV/_rc/-rc}"
+
+FOLDER="${PV/_rc*/}"
+
+DESCRIPTION="OpenGL-like graphic library for Linux"
+HOMEPAGE="http://mesa3d.sourceforge.net/"
+
+SRC_PATCHES="mirror://gentoo/${PN}-9.1-gentoo-patches-05.tar.bz2"
+if [[ $PV = 9999* ]]; then
+	SRC_URI="${SRC_PATCHES}"
+else
+	SRC_URI="ftp://ftp.freedesktop.org/pub/mesa/${FOLDER}/${MY_SRC_P}.tar.bz2
+		${SRC_PATCHES}"
+fi
+
+# The code is MIT/X11.
+# GLES[2]/gl[2]{,ext,platform}.h are SGI-B-2.0
+LICENSE="MIT SGI-B-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+INTEL_CARDS="i915 i965 intel"
+RADEON_CARDS="r100 r200 r300 r600 radeon radeonsi"
+VIDEO_CARDS="${INTEL_CARDS} ${RADEON_CARDS} nouveau vmware"
+for card in ${VIDEO_CARDS}; do
+	IUSE_VIDEO_CARDS+=" video_cards_${card}"
+done
+
+IUSE="${IUSE_VIDEO_CARDS}
+	bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl
+	openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau
+	wayland xvmc xa xorg kernel_FreeBSD"
+
+REQUIRED_USE="
+	llvm?   ( gallium )
+	openvg? ( egl gallium )
+	gbm?    ( shared-glapi )
+	gles1?  ( egl )
+	gles2?  ( egl )
+	r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) )
+	xa?  ( gallium )
+	xorg?  ( gallium )
+	video_cards_intel?  ( || ( classic gallium ) )
+	video_cards_i915?   ( || ( classic gallium ) )
+	video_cards_i965?   ( classic )
+	video_cards_nouveau? ( || ( classic gallium ) )
+	video_cards_radeon? ( || ( classic gallium ) )
+	video_cards_r100?   ( classic )
+	video_cards_r200?   ( classic )
+	video_cards_r300?   ( gallium )
+	video_cards_r600?   ( gallium )
+	video_cards_radeonsi?   ( gallium llvm )
+	video_cards_vmware? ( gallium )
+"
+
+LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.42"
+# keep correct libdrm and dri2proto dep
+# keep blocks in rdepend for binpkg
+RDEPEND="
+	!=app-admin/eselect-opengl-1.2.7
+	dev-libs/expat
+	gbm? ( virtual/udev )
+	>=x11-libs/libX11-1.3.99.901
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXxf86vm
+	>=x11-libs/libxcb-1.8.1
+	vdpau? ( >=x11-libs/libvdpau-0.4.1 )
+	wayland? ( >=dev-libs/wayland-1.0.3 )
+	xorg? (
+		x11-base/xorg-server:=[-minimal]
+		x11-libs/libdrm[libkms]
+	)
+	xvmc? ( >=x11-libs/libXvMC-1.0.6 )
+	${LIBDRM_DEPSTRING}[video_cards_nouveau?,video_cards_vmware?]
+"
+for card in ${INTEL_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_intel] )
+	"
+done
+
+for card in ${RADEON_CARDS}; do
+	RDEPEND="${RDEPEND}
+		video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] )
+	"
+done
+
+DEPEND="${RDEPEND}
+	llvm? (
+		>=sys-devel/llvm-2.9
+		r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] )
+		video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] )
+	)
+	${PYTHON_DEPS}
+	dev-libs/libxml2[python,${PYTHON_USEDEP}]
+	sys-devel/bison
+	sys-devel/flex
+	virtual/pkgconfig
+	>=x11-proto/dri2proto-2.6
+	>=x11-proto/glproto-1.4.15-r1
+	>=x11-proto/xextproto-7.0.99.1
+	x11-proto/xf86driproto
+	x11-proto/xf86vidmodeproto
+"
+
+S="${WORKDIR}/${MY_P}"
+
+# It is slow without texrels, if someone wants slow
+# mesa without texrels +pic use is worth the shot
+QA_EXECSTACK="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+QA_WX_LOAD="usr/lib*/opengl/xorg-x11/lib/libGL.so*"
+
+# Think about: ggi, fbcon, no-X configs
+
+pkg_setup() {
+	# workaround toc-issue wrt #386545
+	use ppc64 && append-flags -mminimal-toc
+
+	python-single-r1_pkg_setup
+}
+
+src_unpack() {
+	default
+	[[ $PV = 9999* ]] && git-2_src_unpack
+}
+
+src_prepare() {
+	# apply patches
+	if [[ ${PV} != 9999* && -n ${SRC_PATCHES} ]]; then
+		EPATCH_FORCE="yes" \
+		EPATCH_SOURCE="${WORKDIR}/patches" \
+		EPATCH_SUFFIX="patch" \
+		epatch
+	fi
+
+	# relax the requirement that r300 must have llvm, bug 380303
+	epatch "${FILESDIR}"/${PN}-8.1-dont-require-llvm-for-r300.patch
+
+	# fix for hardened pax_kernel, bug 240956
+	[[ ${PV} != 9999* ]] && epatch "${FILESDIR}"/glx_ro_text_segm.patch
+
+	# Solaris needs some recent POSIX stuff in our case
+	if [[ ${CHOST} == *-solaris* ]] ; then
+		sed -i -e "s/-DSVR4/-D_POSIX_C_SOURCE=200112L/" configure.ac || die
+	fi
+
+	# Tests fail against python-3, bug #407887
+	sed -i 's|/usr/bin/env python|/usr/bin/env python2|' src/glsl/tests/compare_ir || die
+
+	base_src_prepare
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+
+	if use classic; then
+	# Configurable DRI drivers
+		driver_enable swrast
+
+	# Intel code
+		driver_enable video_cards_i915 i915
+		driver_enable video_cards_i965 i965
+			if ! use video_cards_i915 && \
+				! use video_cards_i965; then
+			driver_enable video_cards_intel i915 i965
+		fi
+
+		# Nouveau code
+		driver_enable video_cards_nouveau nouveau
+
+		# ATI code
+		driver_enable video_cards_r100 radeon
+		driver_enable video_cards_r200 r200
+		if ! use video_cards_r100 && \
+				! use video_cards_r200; then
+			driver_enable video_cards_radeon radeon r200
+		fi
+	fi
+
+	if use egl; then
+		myconf+="
+			--with-egl-platforms=x11$(use wayland && echo ",wayland")$(use gbm && echo ",drm")
+			$(use_enable gallium gallium-egl)
+		"
+	fi
+
+	if use gallium; then
+		myconf+="
+			$(use_enable llvm gallium-llvm)
+			$(use_enable openvg)
+			$(use_enable r600-llvm-compiler)
+			$(use_enable vdpau)
+			$(use_enable xvmc)
+		"
+		gallium_enable swrast
+		gallium_enable video_cards_vmware svga
+		gallium_enable video_cards_nouveau nouveau
+		gallium_enable video_cards_i915 i915
+		if ! use video_cards_i915; then
+			gallium_enable video_cards_intel i915
+		fi
+
+		gallium_enable video_cards_r300 r300
+		gallium_enable video_cards_r600 r600
+		gallium_enable video_cards_radeonsi radeonsi
+		if ! use video_cards_r300 && \
+				! use video_cards_r600; then
+			gallium_enable video_cards_radeon r300 r600
+		fi
+	fi
+
+	# x86 hardened pax_kernel needs glx-rts, bug 240956
+	if use pax_kernel; then
+		myconf+="
+			$(use_enable x86 glx-rts)
+		"
+	fi
+
+	# build fails with BSD indent, bug #428112
+	use userland_GNU || export INDENT=cat
+
+	econf \
+		--enable-dri \
+		--enable-glx \
+		$(use_enable !bindist texture-float) \
+		$(use_enable debug) \
+		$(use_enable egl) \
+		$(use_enable gbm) \
+		$(use_enable gles1) \
+		$(use_enable gles2) \
+		$(use_enable nptl glx-tls) \
+		$(use_enable osmesa) \
+		$(use_enable !pic asm) \
+		$(use_enable shared-glapi) \
+		$(use_enable xa) \
+		$(use_enable xorg) \
+		--with-dri-drivers=${DRI_DRIVERS} \
+		--with-gallium-drivers=${GALLIUM_DRIVERS} \
+		PYTHON2="${PYTHON}" \
+		${myconf}
+}
+
+src_install() {
+	base_src_install
+
+	find "${ED}" -name '*.la' -exec rm -f {} + || die
+
+	if use !bindist; then
+		dodoc docs/patents.txt
+	fi
+
+	# Install config file for eselect mesa
+	insinto /usr/share/mesa
+	newins "${FILESDIR}/eselect-mesa.conf.8.1" eselect-mesa.conf
+
+	# Move libGL and others from /usr/lib to /usr/lib/opengl/blah/lib
+	# because user can eselect desired GL provider.
+	ebegin "Moving libGL and friends for dynamic switching"
+		local x
+		local gl_dir="/usr/$(get_libdir)/opengl/${OPENGL_DIR}/"
+		dodir ${gl_dir}/{lib,extensions,include/GL}
+		for x in "${ED}"/usr/$(get_libdir)/lib{EGL,GL*,OpenVG}.{la,a,so*}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/lib \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/GL/{gl.h,glx.h,glext.h,glxext.h}; do
+			if [ -f ${x} -o -L ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/include/GL \
+					|| die "Failed to move ${x}"
+			fi
+		done
+		for x in "${ED}"/usr/include/{EGL,GLES*,VG,KHR}; do
+			if [ -d ${x} ]; then
+				mv -f "${x}" "${ED}${gl_dir}"/include \
+					|| die "Failed to move ${x}"
+			fi
+		done
+	eend $?
+
+	if use classic || use gallium; then
+			ebegin "Moving DRI/Gallium drivers for dynamic switching"
+			local gallium_drivers=( i915_dri.so i965_dri.so r300_dri.so r600_dri.so swrast_dri.so )
+			keepdir /usr/$(get_libdir)/dri
+			dodir /usr/$(get_libdir)/mesa
+			for x in ${gallium_drivers[@]}; do
+				if [ -f "${S}/$(get_libdir)/gallium/${x}" ]; then
+					mv -f "${ED}/usr/$(get_libdir)/dri/${x}" "${ED}/usr/$(get_libdir)/dri/${x/_dri.so/g_dri.so}" \
+						|| die "Failed to move ${x}"
+					insinto "/usr/$(get_libdir)/dri/"
+					if [ -f "${S}/$(get_libdir)/${x}" ]; then
+						insopts -m0755
+						doins "${S}/$(get_libdir)/${x}"
+					fi
+				fi
+			done
+			for x in "${ED}"/usr/$(get_libdir)/dri/*.so; do
+				if [ -f ${x} -o -L ${x} ]; then
+					mv -f "${x}" "${x/dri/mesa}" \
+						|| die "Failed to move ${x}"
+				fi
+			done
+			pushd "${ED}"/usr/$(get_libdir)/dri || die "pushd failed"
+			ln -s ../mesa/*.so . || die "Creating symlink failed"
+			# remove symlinks to drivers known to eselect
+			for x in ${gallium_drivers[@]}; do
+				if [ -f ${x} -o -L ${x} ]; then
+					rm "${x}" || die "Failed to remove ${x}"
+				fi
+			done
+			popd
+		eend $?
+	fi
+}
+
+pkg_postinst() {
+	# Switch to the xorg implementation.
+	echo
+	eselect opengl set --use-old ${OPENGL_DIR}
+
+	# switch to xorg-x11 and back if necessary, bug #374647 comment 11
+	OLD_IMPLEM="$(eselect opengl show)"
+	if [[ ${OPENGL_DIR}x != ${OLD_IMPLEM}x ]]; then
+		eselect opengl set ${OPENGL_DIR}
+		eselect opengl set ${OLD_IMPLEM}
+	fi
+
+	# Select classic/gallium drivers
+	if use classic || use gallium; then
+		eselect mesa set --auto
+	fi
+
+	# warn about patent encumbered texture-float
+	if use !bindist; then
+		elog "USE=\"bindist\" was not set. Potentially patent encumbered code was"
+		elog "enabled. Please see patents.txt for an explanation."
+	fi
+
+	local using_radeon r_flag
+	for r_flag in ${RADEON_CARDS}; do
+		if use video_cards_${r_flag}; then
+			using_radeon=1
+			break
+		fi
+	done
+
+	if [[ ${using_radeon} = 1 ]] && ! has_version media-libs/libtxc_dxtn; then
+		elog "Note that in order to have full S3TC support, it is necessary to install"
+		elog "media-libs/libtxc_dxtn as well. This may be necessary to get nice"
+		elog "textures in some apps, and some others even require this to run."
+	fi
+}
+
+# $1 - VIDEO_CARDS flag
+# other args - names of DRI drivers to enable
+# TODO: avoid code duplication for a more elegant implementation
+driver_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			DRI_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					DRI_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
+
+gallium_enable() {
+	case $# in
+		# for enabling unconditionally
+		1)
+			GALLIUM_DRIVERS+=",$1"
+			;;
+		*)
+			if use $1; then
+				shift
+				for i in $@; do
+					GALLIUM_DRIVERS+=",${i}"
+				done
+			fi
+			;;
+	esac
+}
diff --git a/media-sound/mpg123/ChangeLog b/media-sound/mpg123/ChangeLog
index 2de0b3bd8a85..3a314304cdd5 100644
--- a/media-sound/mpg123/ChangeLog
+++ b/media-sound/mpg123/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/mpg123
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.282 2013/04/04 06:47:17 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/ChangeLog,v 1.283 2013/05/23 01:50:22 radhermit Exp $
+
+*mpg123-1.15.4 (23 May 2013)
+
+  23 May 2013; Tim Harder  +mpg123-1.15.4.ebuild:
+  Version bump.
 
 *mpg123-1.15.3 (04 Apr 2013)
 
diff --git a/media-sound/mpg123/Manifest b/media-sound/mpg123/Manifest
index 45c9ac6d19c3..0042463a4a93 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -4,20 +4,22 @@ Hash: SHA256
 DIST mpg123-1.14.4.tar.bz2 797694 SHA256 9ca189f24eb4ec6b5046b64d72c3c8439fd9ea300ce1b8b91a05cd6a9d3e5c12 SHA512 bb20de004271ab40ec26da0d4759970d02855970c88d4ca9971b7d41ea72679032619cc952d96d343bd46c6b5eca6e38eb9f000845960bc464894b850b4de014 WHIRLPOOL 8bfae3e44b860d4e88b47b1be287ea9609726426b5ef413c924ec1d0e6383a87fb671220bc8ab864cb8a135a7c3b7a48881f3f49f74092d87f6989c5f493cf74
 DIST mpg123-1.15.1.tar.bz2 800907 SHA256 c6ea4f4db28a66a7ad9f22f890ce10aa796f73ae03f864f3272070c46c088355 SHA512 035e068f546aeb3996d254115160e39e5564b7a17f6ae0b424e5b9d5fbc3c632a78b958495b6c511c839d49eaf3f361a6bb7b4b6108e4596153c824d98e00047 WHIRLPOOL 49c8311fe2bac467b6091628aa36cd7a7c7104f4c9b3ac1b8b11d330fb3136ad2c85363f7e6ac95d68b30bd40bf46fb98b8012220086fad4606e509d2edcd3f6
 DIST mpg123-1.15.3.tar.bz2 802052 SHA256 b6b1aef887835f83ac3d4acb5701ae619041fc60d76548ad779a409080338df7 SHA512 d98893017601403afe84f2d6082a3d2f4ef0a5f8530a3f16a1c909c27e634de21e88f57047b7bba1f5847847b3ef5ab0654532a8fa35aece038e4411198a7eaa WHIRLPOOL 55441a6d6f52c307797c1d9af97dbc28e25777364a5db98e09f4c724d4661d11c7212976ad75bb4b0dbb5c1a09f38bcf4043b28ae99e2562a5f0bfbcb4cfc97d
+DIST mpg123-1.15.4.tar.bz2 802566 SHA256 6885fda3584566c5fa4816e635dfa1d34babf397333b2af00ab7263faffe5115 SHA512 6c16adfe47aa1a474795aa655429bfa2db6b6ade52267ed8352fb76bd82284431c6c0a90651d30be6efe9942e82656658304d0b6fd6a065fce2fe07cecf5fd9f WHIRLPOOL 7971e91b3b36c070746e710f6b4ac94129200680ea943f829d21b880f1ea8afc51ad1588789929e0ddcd4bfe6783e00f8158db6f84362b95507aa3369dc9d9ba
 EBUILD mpg123-1.14.4-r1.ebuild 2343 SHA256 0db5c2e923dee9ed11409294e635bfc1e018bd67e8ecbd81a40dc126d93fbefd SHA512 fd569f2f93eb7c77c9af1aed65d3571555244c32a8922a060241ab8cad32c3b189d9b6c2e6f2c56057696a358607df91c6cf593be9eda2218e385db67daddabb WHIRLPOOL fff2044d57f4c0d177c0a2fd1ae3b652696dc131bd63e4bb61192590376278a4d406d3b0607d492b8d6febdb076f8e64d99c50013620f0426b628c5fef1b7197
 EBUILD mpg123-1.14.4.ebuild 2154 SHA256 8b47dc5ff937b9b59bcc6fe68fa99bdc3be05bb03787160e1cd226ec3efa961d SHA512 19eb959c46e2cea5f03b10e77ecdaa05b61f1287b5393a3c96be7e5ef2ad068e86767d3562a7245ea795aaf2cb3d76a5d0949606f1114b169d0cb77ca59c6d57 WHIRLPOOL 5315b805e7ff1b06718f122538930aec3e521c074695e83a6a7bc47b75a21b492c62b4e371f465eeb3c2fd5aed0228156caa5e7bb9193ca341eb460f34715e7e
 EBUILD mpg123-1.15.1.ebuild 2340 SHA256 fd69e46d60160349da1e94f5c5d94a8422d25c8955fe1e447b76a2f4553372b7 SHA512 fd0b279901373251be8535aeeb5315dec0d58160b454f5cd681bbb568324786577f3422446cb495b2865d9c8e6d58bf5dab093758d47a9fa2ba8051582f6917c WHIRLPOOL 609335ebad1e016fd050f4725c053d5dd2d9ac42a50fc7b7394c7aeace5995482eb2ae276a91a2f893ca561c798fa8a3d293a0f57ce94069896d3ea876a7f8c1
 EBUILD mpg123-1.15.3.ebuild 2340 SHA256 ce8fa5910dbef8991c4254cee7e0a98c07a3717f051f2e8c7f281fdce94836a9 SHA512 0406cacd16f0542c1598c8e18b4f0dd64741d32fbdb205b8dddeebdbe577e0b05b925e7bb663b2950f0c3fc93ceb1b53531b4c0d98c84a5947298be1f39b1e7f WHIRLPOOL 27ba8e50c99b005cf2789cb55933d0b31d1d97198fb5561ab7a5d83f4479bb8a12d842a57e1892e76f58a461737459339fc604960fb6192b88fc45f17d37993e
-MISC ChangeLog 38084 SHA256 c5680c48c51ca58308016669f3b2057bfdc821a8e85a4000f8e10c64f87172b4 SHA512 eb49707eec4f3b6653e0dd5f6c8674253cb5083c4dd4952e1e3e0992feba2f02e62db9fe5b4a2b3f74ddc081adddb659903b2200198bd004f545387b366d84b0 WHIRLPOOL 4346206d177e1f90fbabd1617774a8265a14ef9914e62e07429b5354620f3735411c20a092a86262db806c99b24e2bfd711ee905a61550171856266d4fc19da1
+EBUILD mpg123-1.15.4.ebuild 2333 SHA256 2fa0785c740f0eb05f4cb127df6dc742be933ddd5640429f5e565451bd789fd3 SHA512 bdcf0070052127af17e289fa32251071d87c6c8abc71c337b2153d33691f0a5b04b96483f0321039616c71870968cb7cb1af25f473bb8a612e4463a0450b32f5 WHIRLPOOL f6768039fc4a08a97f184b070bb020804454e6cf26a4c566f2da7848a0a78c32b7c65071110f3e5bfaddee032e5639fe3e69eef2fcdc6aaf619cbd76000445a2
+MISC ChangeLog 38203 SHA256 724bb6a64e0cc86cb4cad52da6ecaba466fd0cf5f311ba1791cf465011ec5d1e SHA512 679874a7923e337ae6441f783fca415e4bb06be36b2c837751429c67b50b0a32cb365ead262932d11415553e82a3267c63cd6ccfb16add12a03a1e688594e256 WHIRLPOOL 4a6726d8260a01303c43e7f23137acb528a935240e5c819ba67e37ca5dbe6c3e96b0c38646536be172572e330b63a8a8c75997db7c1d851baf200087382bc69c
 MISC metadata.xml 492 SHA256 ec073d0ca010ed50d6b671f13cc98a6ee6f221526e56886b469d436c25a6042e SHA512 0cb2796ed7f5eb2696d374b45f83a371944257d177d6c73df0495178dd9e43a56efe947ccdf09dcb306c051f4e00c1af3f95201a32b93ae7eef449fe2acbe7dc WHIRLPOOL 7b1da43b004d4cf690fd16915d0af64207e4ccbf391f8ae1253d14f916a44c92ecfdbe80473c8a0fdff9aa82a7366f42348c97525057ccf1195a8722ff5c67a6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRXSH5AAoJEEqz6FtPBkyjdZkIAKcJ0rW/eni5S/JgWtyj/BPP
-nr5/PIcZT8uqlaEL8SA1OSVFnZV6fwxpIqSeK3MDrmLZDD/nC5jGokBJ9le6oRVt
-yifMF3gT5T9ekqQS1g8jB+Mmv6d28WvuEgK8o4snuN1SY9Xceh2sqwuKV820NAgo
-e06PcUqA0p5VrGoLiEdmypd/h1Q6uCMJ+FtjXpwFZH4LCya1AWtV617ypYGy6/SD
-kcSiwwsBmfMzoSoMX7ZuYloutBMGdoTtFaI3rgnEPX9/QldcC+UMRwDkHhl0q9mq
-r4lvqCNRBcOXO9oQxtcaHqDahByIZhmIQSzVHyjWObDtcheL0DA6h9ZpyZlyEn0=
-=biCl
+iQEcBAEBCAAGBQJRnXXiAAoJEEqz6FtPBkyjZJQIALknc7oFA0NFWK30eTOD9FAO
+PZ8btSJs2qv7imjdJx1Sp+MAWkaRD3MWDP13YrqDYoq+zL4eoK9Z/4q2s134j6m2
+V8xwBy347zIixvIk7WddH/ekik5YRy+f4JsKH3xs5OdXExxq72DzCLnAauocDGLQ
+IpuARGRF5WXyhdGs4eIYdJiz+xvUREp4MPHyJ2fgHjBlmSHxEk5ZRb0PZeOVr2mR
+y7liJTuhQ6IRvAvAEAlFQApmuHTDXgRaVNFePCpl9PT46Tjvzi8Cs1gFCw/hd/i4
+AKBF4SiSRN9jkAQP8qPs4b8Ny1m2U6xGzx7gy5dxT/Fvxv+/gRWBCOgHBLn/1AA=
+=l0Ic
 -----END PGP SIGNATURE-----
diff --git a/media-sound/mpg123/mpg123-1.15.4.ebuild b/media-sound/mpg123/mpg123-1.15.4.ebuild
new file mode 100644
index 000000000000..453f07d1fa9d
--- /dev/null
+++ b/media-sound/mpg123/mpg123-1.15.4.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-sound/mpg123/mpg123-1.15.4.ebuild,v 1.1 2013/05/23 01:50:22 radhermit Exp $
+
+EAPI=5
+inherit toolchain-funcs libtool
+
+DESCRIPTION="a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3"
+HOMEPAGE="http://www.mpg123.org/"
+SRC_URI="http://www.mpg123.org/download/${P}.tar.bz2"
+
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse"
+
+RDEPEND="app-admin/eselect-mpg123
+	>=sys-devel/libtool-2.2.6b
+	alsa? ( media-libs/alsa-lib )
+	jack? ( media-sound/jack-audio-connection-kit )
+	nas? ( media-libs/nas )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+	sdl? ( media-libs/libsdl )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS NEWS.libmpg123 README )
+
+src_prepare() {
+	elibtoolize # for Darwin bundles
+}
+
+src_configure() {
+	local _audio=dummy
+	local _output=dummy
+	local _cpu=generic_fpu
+
+	for flag in nas portaudio sdl oss jack alsa pulseaudio coreaudio; do
+		if use ${flag}; then
+			_audio="${_audio} ${flag/pulseaudio/pulse}"
+			_output=${flag/pulseaudio/pulse}
+		fi
+	done
+
+	use altivec && _cpu=altivec
+
+	if [[ $(tc-arch) == amd64 || ${ARCH} == x64-* ]]; then
+		use sse && _cpu=x86-64
+	elif use x86 && gcc-specs-pie ; then
+		# Don't use any mmx, 3dnow, sse and 3dnowext #bug 164504
+		_cpu=generic_fpu
+	elif use x86-macos ; then
+		# ASM doesn't work quite as expected with the Darwin linker
+		_cpu=generic_fpu
+	else
+		use mmx && _cpu=mmx
+		use 3dnow && _cpu=3dnow
+		use sse && _cpu=x86
+		use 3dnowext && _cpu=x86
+	fi
+
+	econf \
+		--with-optimization=0 \
+		--with-audio="${_audio}" \
+		--with-default-audio=${_output} \
+		--with-cpu=${_cpu} \
+		--enable-network \
+		$(use_enable ipv6) \
+		--enable-int-quality=$(usex int-quality)
+}
+
+src_install() {
+	default
+	mv "${ED}"/usr/bin/mpg123{,-mpg123}
+	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} +
+}
+
+pkg_postinst() {
+	eselect mpg123 update ifunset
+}
+
+pkg_postrm() {
+	eselect mpg123 update ifunset
+}
diff --git a/media-sound/ncmpc/ChangeLog b/media-sound/ncmpc/ChangeLog
index 6ecb9c8485dc..f4aa9ac8ac4e 100644
--- a/media-sound/ncmpc/ChangeLog
+++ b/media-sound/ncmpc/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for media-sound/ncmpc
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.79 2013/05/21 15:07:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ChangeLog,v 1.80 2013/05/23 11:33:37 ago Exp $
+
+  23 May 2013; Agostino Sarubbo  ncmpc-0.21.ebuild:
+  Stable for amd64, wrt bug #470752
 
   21 May 2013; Jeroen Roovers  ncmpc-0.21.ebuild:
   Stable for HPPA (bug #470752).
diff --git a/media-sound/ncmpc/Manifest b/media-sound/ncmpc/Manifest
index dff27bdad21e..aacbc6263881 100644
--- a/media-sound/ncmpc/Manifest
+++ b/media-sound/ncmpc/Manifest
@@ -1,16 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 DIST ncmpc-0.20.tar.bz2 356991 SHA256 f19b15be4cb94f402bc488463e8159958d1a395b2fea97c02522b848061348e2 SHA512 4072f11d6956313cd63ef22eddedc6eb1919900038af1acf4b9483ac8515d5e112be5180b2a265ca08f2f9c1705d4e2e39282a4bfb543e4015ea923498fe1063 WHIRLPOOL 47f061ea32a91a3493842b51281c8fea1f9c344818bdd86e795e1c242048c0bc37906fca77218857f63980497b316e860a7ad27af0835d7c8a8388e2ef19383a
 DIST ncmpc-0.21.tar.bz2 337229 SHA256 648e846e305c867cb937dcb467393c2f5a30bf460bdf77b63de7af69fba1fd07 SHA512 e6ae3d741e239f48b833b15bd9805fd7bb1d491eb5154a37da2363b9d57ac87fb4744e12bd9bdcd5d3e011190afb8980c20d044a2eaf54e082fc202a192b0ecf WHIRLPOOL 748c3a61eb9bd3817aab42988df484b2862c77673dbdb0fadba7006dc195138085ec48d81284771eeedc98c1362cffe7592ce845528f4d72487c4a142d407bdf
 EBUILD ncmpc-0.20.ebuild 1577 SHA256 2d6c6acf086de7287f3edecbc400f5ab128132983171c4f1f47c28f4867c33c0 SHA512 2fea37841ec439869891b3e21622d9dfe4649884edc90a086931a1e46ad5c5f4629958062f7967cccbcee45dc1035a08a4f9fc31325a07ddc1208d273947fdb9 WHIRLPOOL 0edfa1fb9cf08762173046eb5978d47c0f5441c5374026b4be3b0b3c23c58d437df9cc590655928c4f12b3cd4570c847614980c50ede266d4a80acc1672b84d0
-EBUILD ncmpc-0.21.ebuild 1626 SHA256 511be930da90dee27c9993cfea63cc233762580ca2130e4054729b8d4b2c6f8b SHA512 4ffda49e5dab712180db7d35392d0a2c2ede7a0c0a63589a21b0809f20bc7e68d66b91003e0dc10f4e55f088ee1e877777332b3b29d8bccb5d43a303d9e1a21d WHIRLPOOL 4449d02dc6dfae2b1c207957e19df86b98cfc79cd677227d854c9749aed13d71bb0a64fedfe26f289c6296123f93403e39761d826a1070e8800b570708b1e999
-MISC ChangeLog 9972 SHA256 19be41e86aaf918f02ecee4bed08f9d8e3a310d117ab7711cf77f384e9bce237 SHA512 31a0822fc75f4d41eea518e7f59a470e2cdfedfccb0eb38d0a91162cc3df4a28b59a9131d3ac4bce3e72fdf467a50a6ca1ef6ce8d319acddd95e5a9903dfaa45 WHIRLPOOL 7f909a4a658382a4f0bf50cb765dc2508df590d8580385a9efecf156bf7212d39c06df84d068607af99441c5b769cb7cb77387c39507517b98d542356fa2de42
+EBUILD ncmpc-0.21.ebuild 1625 SHA256 cdbdb7de358c89a5158fa9b8d9d28b1a8211bc6f2dc3433c318a1172a5d07592 SHA512 dfddd6fd61755ed1b5162d011e53d4a1aae2e24dc6616772c178229b8f06fcf672b8b3dd9ab737470c3de6859f90a34a324cb58bb7d8280d3b78d03d4eb5b413 WHIRLPOOL 5ee1c65deed66e066222853c2ab189923709e6fa4e9f44ad3e88d86e0c5981cffb0d87af8f75b73ff0ac6c8608e0784c28d03a34b33d2d9675de180909cf49e5
+MISC ChangeLog 10077 SHA256 b41b4bc4429c9dc5485e3b7928738b7d107567fff1550d2c27afd3773044a686 SHA512 352543515fe1be08902dfcbe9e8e2b54da0bf8c66dc6109f4890ee18116df8d756352966d1fbfe8ba308371f266e02e0607cb980577362180ea393971fe17d43 WHIRLPOOL 61d5e83c652012da014dcbff1347237103e201861e4d3dcd4415d09611fddb78661414a5e56fbe65595433412e5ec3e0cab64dea0c1b3e29587f82a162ab4ce0
 MISC metadata.xml 782 SHA256 da4eb2c23202dfd4a5bfae9acec4166360007d2830e6aa229bcc53ac23ce5da4 SHA512 9171d706cdad2c4f6e10070b737c9578f67791f0d0d4ec0522eff581d1c4d140f9678836bfe29225bb25f07c747e18d152df1caf4f4f6159f267e1fbd9805a8d WHIRLPOOL 5e0cca3fcfaafc8827a76a5cf70b1e192224bce235973fbc6faa3c1cd4d5b06f8aaac25c58b9e1864b1304d2994dad9b9bfdfee2675f196606f0e3f52bc7c4b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGbjboACgkQVWmRsqeSphPTzQCdGmBC8aWigueYOSHa+zdZhQ08
-38YAnj2SmIjxDz1ZJNL+cQkwLwdzZGZz
-=kMHH
+iQIcBAEBCgAGBQJRnf6NAAoJELp701BxlEWfWeQQAKjPvrDZGxcNCn0B2Hbdk2WO
+i76oeLn1Ps4jlW3fGmPFlGEWDTkzQ6sTNXOW8rEBj7yIncazJ1cqOVUEChgDLbZE
+P2F1iUA0mRWAatLiEGAopmG6KIggjumzDaDCeXYaku795yUbk/ZwOAj9TbFARjXC
+oVokv+v9GXfD8eTkzRMZrZW71kYdfZNBKIDiPHV7fJqw95VIrsF0mnQLwKgv5Ps0
+MCz0X/XaRd/0ekIgTv0STy+8Y5z0vTVRdkACJrjQo+/TOpc9r8UuZL0krgkLyya+
+PN6AlH1qxa+vj8+n3F1Q7Kp8WQjWdJUmlL+d08OV3WaFJ9BZ3ikKrrJS24iSwJ/y
+HmwWoGEmutlEvFmItdQv82ImbEU3U3iTxRI+lIX4griWO3ULAixyQ7VGCTC8Qdgl
+aW/52EB/DzpXqYuhze7ceXBT62vpW1aSIacc4XOGPua5PERcsYDPF3g/I7bFNmWv
+wAiJqMUxyDYBlO1vMZiyzwwA35LdrzMJf2pB7sWiWzfSvGtgc6g0AA1cdfuVkAcw
+v8hQQbk4UDDMhFtbmiUmLZcoJ0KkBDGV2EE1V40NNylxjGul3Xtm69LY8p8yZCRH
+/NP9XhozVpOHGIi4ZZ6/tgGxiDJn9WgLn9sRufQFCRYjgmohSlLk04cqrurv9IIy
+DRY06OqlY4tj6bUPTFuq
+=L6js
 -----END PGP SIGNATURE-----
diff --git a/media-sound/ncmpc/ncmpc-0.21.ebuild b/media-sound/ncmpc/ncmpc-0.21.ebuild
index 0f8b0e4e4895..b9cf38e2b36b 100644
--- a/media-sound/ncmpc/ncmpc-0.21.ebuild
+++ b/media-sound/ncmpc/ncmpc-0.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.21.ebuild,v 1.4 2013/05/21 15:07:37 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ncmpc/ncmpc-0.21.ebuild,v 1.5 2013/05/23 11:33:37 ago Exp $
 
 EAPI=4
 inherit multilib
@@ -11,7 +11,7 @@ SRC_URI="http://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="amd64 hppa ~ppc ~ppc64 ~sparc ~x86"
 IUSE="artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen"
 
 RDEPEND=">=dev-libs/glib-2.12:2
diff --git a/media-video/ffmpeg/ChangeLog b/media-video/ffmpeg/ChangeLog
index c3e2c348868b..1b4e11ec9bce 100644
--- a/media-video/ffmpeg/ChangeLog
+++ b/media-video/ffmpeg/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for media-video/ffmpeg
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.649 2013/05/16 16:42:59 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ChangeLog,v 1.651 2013/05/23 00:41:10 aballier Exp $
+
+  23 May 2013; Alexis Ballier  ffmpeg-9999.ebuild,
+  metadata.xml:
+  add quvi useflag
+
+  23 May 2013; Alexis Ballier  ffmpeg-9999.ebuild:
+  disable v4l2 outdev with USE=-v4l
 
   16 May 2013; Alexis Ballier  ffmpeg-1.0.7.ebuild:
   add libavresample to LD_LIBRARY_PATH for tests, bug #470034
diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index 1f2dfaea548a..2be0ec4fc619 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -11,13 +11,13 @@ EBUILD ffmpeg-0.10.7.ebuild 8936 SHA256 3905bf8402fc0999a61953c678c524706294e531
 EBUILD ffmpeg-1.0.6.ebuild 9542 SHA256 5388e118e1ceada39dd368a49ad589bf692ff5864d3a7a7776392f7aa8952d36 SHA512 3e6f9c41d603684f626c80e923a11053ce67057673f26e27e99db57d82d27d96c1a907dcecab6d4892d4d5e43a669bc9783c50d2369bcaf40fa419bde89a6680 WHIRLPOOL 74049d0475ba36550b732cc2a3babd398bc74a191409b615a4a95140db93ff3d41236d55cef537bed08a68efec9042070b1b95b9657a8fa41a17b7dbefda85a3
 EBUILD ffmpeg-1.0.7.ebuild 9563 SHA256 b8c9d427306359b8ab1632eca7f6c68f902f78471aeb4f40d691391bf01ee2ce SHA512 84318187f5879019626926a386617d7b7aeb985f54f151b9e1bd3a8672fd338eb9ccd3fdcba48d7a98017dd75db47b12d718c38e0a474677f2d182b51eed0889 WHIRLPOOL c7e3504d1f24383724fcbc50b172c4a83da2e3f17d71d04d644452e678ec85251e5340b3c7495dbe4c47f9e6324df27831517f83a49422d17857f577eb903fd2
 EBUILD ffmpeg-1.2.1.ebuild 8924 SHA256 46fab2cfe8f695219a0b5a31824ff7ac38d38cb166cb85f73009ed9cdc805875 SHA512 2dcfee07ca560d9dd046e03362a39d037c577246db0ebb396e29f67f469fd8e39660d77f0cdf5b43c6ba10dfb650748a349bd60b9783fca5c4b38e4c4418d8f0 WHIRLPOOL c4a60f22af160f23595e3aebcc91552e52f3e3a3801094240051ceeec332c649b6253fb5ebb21b8460648844f5ac618bfe172b58f95ee99ffd75823cd13cca60
-EBUILD ffmpeg-9999.ebuild 8925 SHA256 da1854518b168ba0ddc4a745231578da865a4fadfe39d933d07d91b18815fa2d SHA512 84bb1bb001b6b75d36927ee62d77fc47aeefe70d7cfe569463fb0d5261aa501d51d2600f0c486e2fbe30b03600f2cd79eab3b45423bdb372284fa8df1b712a3e WHIRLPOOL 04aaa4220a4ab85984680ba2e4c0ab202f9aa460196b94c2dd2f451cde0c216b6c26cdf50f31fd59557ee760794711a2d8407bd7f9534a9aadbf228078968dea
-MISC ChangeLog 91129 SHA256 48c16b8ff88f62edda6e3d54f45a0fc4ddf99ab7a9c34a09e583ed4479d2e0c7 SHA512 2f4b0a1aac70976e5193dcca06eceb0c1f307e61a675bb17c15ed76ab0176c584905bfd1cc0b6e725e6ea677b200dd535dc5cb676871347688c4227fb2418d21 WHIRLPOOL 24be35e1745a75a23e63b8e258fb8f3d743238b364ed902ed88cd85e23dd2bd24e6f94db70869aadfc6d608f2d33d25c5623ddd1581f1eb589419991410f6e30
-MISC metadata.xml 3506 SHA256 87175b36b5ab9e0d0ab24c7a758835671361a73d70c5008d596e5d2ff8486493 SHA512 445fc69245aaab198611ffcb110d81eba90df93c37c1dbc1e7ce63e53fd72533d28f60f8150461d23af5ee4d3537324f48b0f7f05120f46273a8451ce934ebe0 WHIRLPOOL f3771586966dfe434d7e9703b380b426bcd175a0b30e2b50815903f7480c24db2f1f9b9ba8145a14b63647460966768a5def329f91708dee2d19b2d241d5eaf7
+EBUILD ffmpeg-9999.ebuild 8987 SHA256 41eb875bf94622167e152995e6d82075e5940bb704f7df72a78e96f511ab70e8 SHA512 6c42f2ac53c79ff6a223553835018fc97655a31fe683a291aaf413d13610a762deab6eac2d57ce5d7e2843a3594224fdfe0bc80877745077dd9d2fa62027eaa4 WHIRLPOOL fa6e6337adef68f7860c839498119d97d4e47cb8f554ea7327c054659c8d471f32ee87f9227d8fa6ebbfa612559e3e5eddd04ca0b0d8c83f84c6b060efcf2918
+MISC ChangeLog 91346 SHA256 f04f999a2f13d54ec0fd2d43f44b5a7383135b03f35054cb43102a299dd67b2d SHA512 224ea803e496a3ae020a6a59f7df2fff2d0273d25c693bfe39df49678a6a114a1248be189f4dc702d9456d697898d5f9c11407b5b3d023ace53812011eb9dede WHIRLPOOL ee8151fea7ec5c41cfb395051fbc877c55f37ba47f0fee30bfea1a598025b2d0549867cdb36478ee5819ffcfebe3b5949799450fd68a79cb3fc433b4406017e2
+MISC metadata.xml 3610 SHA256 f063020557dbf61fffd89023e8b4181bdbbd65ff775a12d5eef68d8ab5c8d32f SHA512 d48ae96183cb2412b251b60a2d49f9ad847b62b1a3e822ec1559108ec87974f9a45d464fa12593fdb95e124bc1e7c88d3e710cf41327e4bf725d00f9450e67cf WHIRLPOOL 4082cf7d5382f8f4d25ea60ef1410a6d1ad90ddbad2b622cbba47e1f31e782ef24ef4f05fd064a04b4d63e16544dd7307e85970cfe57483d95c82f0c03d0eb0a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlGVDJUACgkQvFcC4BYPU0qxjQCfcWjAS+VFP0h2fpJm5CQK1Qr6
-ul8AoKEEgCeW7nuR7WxRRqshK0VXXzxA
-=vreL
+iEYEAREIAAYFAlGdZagACgkQvFcC4BYPU0qqwACgo8F9qgxV3rOFMIceN7q/i0+b
+wDgAoLDdtZHvvGbgwgY+Zkxnc+Kj0btd
+=Xswq
 -----END PGP SIGNATURE-----
diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild
index fc1669f550b2..12af7946bf93 100644
--- a/media-video/ffmpeg/ffmpeg-9999.ebuild
+++ b/media-video/ffmpeg/ffmpeg-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/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.126 2013/04/04 07:34:43 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/ffmpeg/ffmpeg-9999.ebuild,v 1.128 2013/05/23 00:41:10 aballier Exp $
 
 EAPI="4"
 
@@ -33,7 +33,7 @@ IUSE="
 	cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r
 	gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass
 	libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic
-	pulseaudio rtmp schroedinger sdl speex static-libs test theora threads
+	pulseaudio quvi rtmp schroedinger sdl speex static-libs test theora threads
 	truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib
 	"
 
@@ -88,6 +88,7 @@ RDEPEND="
 	openal? ( >=media-libs/openal-1.1 )
 	opus? ( media-libs/opus )
 	pulseaudio? ( media-sound/pulseaudio )
+	quvi? ( media-libs/libquvi )
 	rtmp? ( >=media-video/rtmpdump-2.2f )
 	sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] )
 	schroedinger? ( media-libs/schroedinger )
@@ -169,7 +170,7 @@ src_configure() {
 	ffuse="${ffuse}	cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal"
 
 	# Indevs
-	use v4l || myconf="${myconf} --disable-indev=v4l2"
+	use v4l || myconf="${myconf} --disable-indev=v4l2 --disable-outdev=v4l2"
 	for i in alsa oss jack ; do
 		use ${i} || myconf="${myconf} --disable-indev=${i}"
 	done
@@ -192,7 +193,7 @@ src_configure() {
 	# Decoders
 	ffuse="${ffuse} amr:libopencore-amrwb amr:libopencore-amrnb	jpeg2k:libopenjpeg"
 	use amr && myconf="${myconf} --enable-version3"
-	for i in bluray celt gsm modplug opus rtmp schroedinger speex vorbis vpx; do
+	for i in bluray celt gsm modplug opus quvi rtmp schroedinger speex vorbis vpx; do
 		ffuse="${ffuse} ${i}:lib${i}"
 	done
 
diff --git a/media-video/ffmpeg/metadata.xml b/media-video/ffmpeg/metadata.xml
index 96d35d94a9c2..664200ffd17f 100644
--- a/media-video/ffmpeg/metadata.xml
+++ b/media-video/ffmpeg/metadata.xml
@@ -33,6 +33,7 @@
 	Enables dev-libs/openssl support. Adds support for encrypted network protocols (TLS/HTTPS).
 	Adds (decoding) support for the Opus codec via media-libs/opus.
     Force shared libraries to be built as PIC (this is slower)
+	Adds support for playing media from Internet services using the quvi project.
     Enable Real Time Messaging Protocol using librtmp
     Enable Dirac video support (an advanced royalty-free video compression format) via libschroedinger (high-speed implementation in C of the Dirac codec).
     Faster floating point optimization for SSSE3 capable chips (Intel Core 2 and later chips)
diff --git a/media-video/handbrake/ChangeLog b/media-video/handbrake/ChangeLog
index f067cbef470e..1f5292055b29 100644
--- a/media-video/handbrake/ChangeLog
+++ b/media-video/handbrake/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/handbrake
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.5 2013/05/16 05:52:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/ChangeLog,v 1.6 2013/05/23 14:48:25 tomwij Exp $
+
+*handbrake-0.9.9 (23 May 2013)
+
+  23 May 2013; Tom Wijsman  +handbrake-0.9.9.ebuild,
+  handbrake-9999.ebuild:
+  Version bump to 0.9.9.
 
   16 May 2013; Tom Wijsman 
   handbrake-0.9.9_pre5441-r1.ebuild, handbrake-9999.ebuild:
diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest
index ce6802ea9d56..5eb5f37677e0 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -7,19 +7,21 @@ AUX handbrake-9999-remove-dvdnav-dup.patch 879 SHA256 cdfa247f00ad5b75af115618b7
 AUX handbrake-9999-remove-faac-dependency.patch 7478 SHA256 dd8b096ee47dfdc2bb3d3c3a9bff3596f0d88b6d5bb428f775aff597c229d83a SHA512 6815ae03b0688df3aa4c7091c7fe2461abed2e1c5f7c72324b3cc677f7bf00e38ce7c28d8525fe79febe8689ee67ebd05e7cbb5eb5ab7c328a8e8972372f7497 WHIRLPOOL 9fa277f7e0f5b2e4efe8ae415509fd3e574e270bb51a8a76e639284f50c3d3b05a929b01cbdb8ad0b008aabbe47780161d600eca3a0f6aa12bf442b4421a1cd5
 AUX handbrake-9999-use-older-libmkv.patch 583 SHA256 17e15eccc630bf5dfcd66609d19bdcf57c731fba6c314af3a5a6d083de80ba7c SHA512 6ebcf55ffaab20301da1ceb2d993580a6b875676b65ee2d61d3fcaedf9e5a3b7e52128dae30363923218ba2e6f4510232c0e7738343e35c4c95048d35ff3933b WHIRLPOOL 075f604ec3c48345f435b3b2cd39b7d175c7df69600e5ca9438cd6d6a380673ff8848a2bf111cfe8fb3dff21ad33e822fbf7b45a3e547da8a0d9170a933e78d3
 AUX handbrake-9999-use-unpatched-a52.patch 944 SHA256 b8ccdecb0a70650af162fa649a323dd1c31268efe7c9ace58a89d70eab984c80 SHA512 aff9da64a434946600d1683f101bea1024319a418c57b0dbe9a8c287c72edf91d18102d51b817d9cea6e825d3a945741893956c55df16bf8f61b415a50dbeab4 WHIRLPOOL 97cf18bb453b435f88a60ed6417811eb8ce5c7af68f4e3d12316a72ac1594637f288511b54aee2b50fc04c356a0dba23dcf71b5712e9520371ab112f99b4f90f
+DIST handbrake-0.9.9.tar.bz2 9315199 SHA256 a71dd774104cda00cfb51a813550351d638253791f2f419d04a66f3158a835b3 SHA512 c891e78f5fbc62fd46055bf6cd62e631bc181a2a21167dcf3fe18cbc4b57bb36c11d52dcf39b3c923b807160e79fb2b1f3c36d60f3024149206a86e7bd6d5b68 WHIRLPOOL edcb7758ba68e35b70700bbf484ac7794739a14302d205c080ad4fdf3151b460ee54b0c8dfffd68bca2ccb1a7d4379c9bbb7c3a9939c6bd6a06e1be95f09169e
 DIST handbrake-0.9.9_pre5441.tar.gz 5580422 SHA256 6a6b8348229c4ae820be329413418d2a50a023922f28119c5b6e5aa155e3ec22 SHA512 aa3faca48dc7fafa5e56c0388300c86b81084549228f20908351a878e737ed54609b98c557ded921e215e4f5ced84aa96a0d64c11a7e67a40ac7eba24f2701a4 WHIRLPOOL 6ad2c23b09414e6d5b15c8c8e0dfa9eac05040c0b1673549b94293c5c20f7f55b8a98d39920be9e6c980664fb861dbf23ee9704fe3bffb7b8facf9722a4e1cb3
+EBUILD handbrake-0.9.9.ebuild 4118 SHA256 d64642c24306fe96d97cbc6988ebdc9f98701b6fe988f83941099dce4b0221f6 SHA512 74ad26fd57b70c2b5405b4e98b10fddf80ed389c420d559652f44b802d49989f302000068bce947247fd126bdccb60d530215aae1bdb7570faec47f44986e4b1 WHIRLPOOL 014e024baf23b9b89601fac9a123ee8e826ba9f2a27b5e334efdcb8cc9f4c41c777120984661a78a3bc92a1bfa3e1e49dfe52131be486f5c8045e4e447e56091
 EBUILD handbrake-0.9.9_pre5441-r1.ebuild 4108 SHA256 fe419fb97521a81ff4c981e177e89ca9b9871aa225c71877a456bb922164b4c4 SHA512 549751270d5ebcda4eba73e2dabf9435e1ee08022e12e9a5f9fef7554f40619b71009df5992c93d05c61d12a91039c277bae6b9c0786af2432a03a5e4a5f9910 WHIRLPOOL 2b636143acff7ce59f67b08a05622e1b16f182892d71bb53ae444d1844aa2bd921fd8f437767d0f1b521084dea3c01e224ef18a4dbeb2b527cd25699f6f6a3ee
-EBUILD handbrake-9999.ebuild 4096 SHA256 245f6b6cea5908a385c9f4685804b7e1c64e8853357ee955b98d1e5cba2ce08b SHA512 8cab6a62b53c1ecd43e7f87101c000e8d38a95f87d619736ca426d892b3685e88e4fca16b27d67ec7191664fdef760071cb8359ea1941d215f6421adf78310f3 WHIRLPOOL 6b3b02c33fff6f490b02b3b0c8a0d4a24aad765130d14bb0a95a325d5208a1c2cb9d5a5fb829dd2a72591684f0038f2865f9321b86bd2d3ea715a8f6515d16d9
-MISC ChangeLog 2297 SHA256 46df64558d5a3c376aa123ce33d2fe945cae875b3c6f515f7d06957eb82395eb SHA512 600359446354c5911973a172bfd74413c8199a255bc78c2a1c93b569b6cef967ca8fac49108bbb6e3d6c53ab0d31762774ec41a862ff78aa261c0a8f293937f1 WHIRLPOOL fb1163a87ab14d5f9973fad3f9c9ffac87c0ba2293defe4dd371e9fda323bf17bc9f2033414affd3649b1a3a1bb6b424d50f4fb69c4f77e4275d63f1463f8966
+EBUILD handbrake-9999.ebuild 4117 SHA256 73f4760d554e019a7716f2076d1115428117fadbae25d496010debc1b34bd9f8 SHA512 adf811eaed25ab1c9c96483d31aaef93e7b035a3095818b47488f8b38b8ac7019a0d5051ec9e0064ca533bf2bc281cb1f485aa1a773da54f839626bac7d4396e WHIRLPOOL 71258cff91b976ce6db5e42c8af86ebc3f8c8d85f77ad54183a0e088fa198c56d5956d3d798796eee0ffb621b77fe0e74a342cf7099861d1485fd6e889adc4f5
+MISC ChangeLog 2452 SHA256 4d049ecb8565cb9bc98fc9408e009c4045eea75b95426201f9bf038b2c0768e4 SHA512 f746059baa8abeb0d9980515de239c3b09b15f61e545384da6cc90e95e1d8d3a6adddbdb374154aee83fd10c341236feae36c21f505e400498c908786ee98446 WHIRLPOOL 87a83e742136d9f69aabb5f4b53c298775ba8a7e263208f01e85f34d67c3eb41091e976c7c65f02b777c40c9cc04402b994d1c30db14ad9d03777d24a73fbbf4
 MISC metadata.xml 949 SHA256 0c2dea9a78292e142a185934a0dd7652f713b4ee68935de6e03a73e43074acfc SHA512 ed66b0375be0c9c07f06222a9de970e60446f543de10fe24e6430c687bae088858d926b2121095bc42fe2e9e6c940d459ad4936285a3291982e01e6e4e71c8b2 WHIRLPOOL 6942dd6c1cab7dfd58a65d2c7ad56e1372a6a7b03e525c027de015ef5ebf1d3a7823d202afa16f867f413ff0255bcd0e13f2d4a3ec19d362ee40db8262a2bfeb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRlHOnAAoJEJWyH81tNOV9pwkH/1CB2DZDwMc/EZAIO6ek9ucM
-rqUr+Rq74p7XqEn3e2QWJEglvRrfhFoC2Ry0cr30a269GLjDXeqjzLHHx3dCgYEc
-U+HvuMyrSpSWtuGk7IIbVn7qXsQIs9YV8mMKgBZQEk2L3MSLba8m7Nk7ySztO3ns
-z5StpTt8GHbjnn4puRYc1GUiV81zkDwYxgd3cYNm5tS8FNKU5PWqr5iz26Zz/pYo
-Pxm5eg5JdEhFs0b0KVE69ZjfixGcQMBRPlxDX3sw5FU4q0lKFn+H2AOOBANJFvv3
-c+51q3FA9n+NcJKZ28sAOlZY8zd0vmJlQ9lzcRAaMo2GtT3SlkQ07a7BnYceREw=
-=cprG
+iQEcBAEBCAAGBQJRnivTAAoJEJWyH81tNOV9c24H/jR9bX9blnvKcnwXNRLomkyY
+2MhUbPZ/IgdLVdEtPGgqDGZk7fUNP4h+VezQiSiiknFU1x0sYM9px0jzy9rmsbrj
+xWlKiI4mDCN91eYG2YCb5EmV94O34yVc3NWs7Atqffpk6Jogm6lkiGLTf/9usSXa
+gUK0NCbnL2NxvbrhcvLWEZJQjSI2mdpyqVjtzV2h00bTY0ib2xA9Q0Xa1ngCBjRB
+3vdBHaYhBtI9OPL79RrtfdCEftVjaobZ2yXizAYB/eQMczx+jMeLfvXqtq6n1OQd
+X+wNCPr7tCNuSERlgmm6cZucSCe0CqXToQ6k4Jr4ol9VjL2iYJUVYiga2lHbWNw=
+=1GFd
 -----END PGP SIGNATURE-----
diff --git a/media-video/handbrake/handbrake-0.9.9.ebuild b/media-video/handbrake/handbrake-0.9.9.ebuild
new file mode 100644
index 000000000000..3e5c44c66e43
--- /dev/null
+++ b/media-video/handbrake/handbrake-0.9.9.ebuild
@@ -0,0 +1,174 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-0.9.9.ebuild,v 1.1 2013/05/23 14:48:25 tomwij Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_{5,6,7} )
+
+inherit autotools eutils gnome2-utils python-any-r1
+
+if [[ ${PV} = *9999* ]]; then
+	ESVN_REPO_URI="svn://svn.handbrake.fr/HandBrake/trunk"
+	inherit subversion
+	KEYWORDS=""
+else
+	SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/HandBrake-${PV}"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder."
+HOMEPAGE="http://handbrake.fr/"
+LICENSE="GPL-2"
+
+SLOT="0"
+IUSE="fdk ffmpeg gstreamer gtk"
+
+# Use either ffmpeg or gst-plugins/mpeg2dec for decoding MPEG-2.
+REQUIRED_USE="!ffmpeg? ( gstreamer )"
+
+RDEPEND="
+	media-libs/a52dec
+	media-libs/libass
+	media-libs/libbluray
+	media-libs/libdvdnav
+	media-libs/libdvdread
+	media-libs/libmpeg2
+	media-libs/libmp4v2:0
+	media-libs/libmkv
+	media-libs/libsamplerate
+	media-libs/libtheora
+	media-libs/libvorbis
+	media-libs/x264
+	media-sound/lame
+	ffmpeg? ( =virtual/ffmpeg-9 )
+	sys-libs/zlib
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		!ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 )
+	)
+	gtk? (
+		x11-libs/gtk+:3
+		dev-libs/dbus-glib
+		dev-libs/glib:2
+		x11-libs/cairo
+		x11-libs/gdk-pixbuf:2
+		x11-libs/libnotify
+		x11-libs/pango
+		>=virtual/udev-171[gudev]
+	)
+	fdk? ( media-libs/fdk-aac )
+	"
+
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	dev-lang/yasm
+	sys-devel/automake"
+
+pkg_setup() {
+	python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	# Get rid of leftover bundled library build definitions,
+	# the version 0.9.9 supports the use of system libraries.
+	sed -i 's:.*\(/contrib\|contrib/\).*::g' \
+		"${S}"/make/include/main.defs \
+		|| die "Contrib removal failed."
+
+	# Instead of adding a #define to libmkv, we expand it in place. 
+	epatch "${FILESDIR}"/handbrake-9999-expand-MK_SUBTITLE_PGS.patch
+
+	# Fix compilation against the released 1.9.1 version of mp4v2.
+	epatch "${FILESDIR}"/handbrake-9999-fix-compilation-with-mp4v2-v1.9.1.patch
+
+	# Remove libdvdnav duplication and call it on the original instead.
+	# It may work this way; if not, we should try to mimic the duplication.
+	epatch "${FILESDIR}"/handbrake-9999-remove-dvdnav-dup.patch
+
+	# Remove faac dependency until its compilation errors can be resolved.
+	epatch "${FILESDIR}"/handbrake-9999-remove-faac-dependency.patch
+
+	# Make use of an older version of libmkv.
+	epatch "${FILESDIR}"/handbrake-9999-use-older-libmkv.patch
+
+	# Make use of an unpatched version of a52 that does not make a private field public.
+	epatch "${FILESDIR}"/handbrake-9999-use-unpatched-a52.patch
+
+	# Fixup configure.ac with newer automake
+	cd "${S}/gtk"
+	sed -i \
+		-e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADERS:g' \
+		-e 's:AM_PROG_CC_STDC:AC_PROG_CC:g' \
+		-e 's:am_cv_prog_cc_stdc:ac_cv_prog_cc_stdc:g' \
+		configure.ac || die "Fixing up configure.ac failed"
+
+	# Don't run autogen.sh
+	sed -i '/autogen.sh/d' module.rules || die "Removing autogen.sh call failed"
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=""
+
+	if ! use gtk ; then
+		myconf+=" --disable-gtk"
+	fi
+
+	if ! use gstreamer ; then
+		myconf+=" --disable-gst"
+	fi
+
+	if use ffmpeg ; then
+		myconf+=" --enable-ff-mpeg2"
+	fi
+
+	if use fdk ; then
+		myconf+=" --enable-fdk-aac"
+	fi
+
+	./configure \
+		--force \
+		--prefix="${EPREFIX}/usr" \
+		--disable-gtk-update-checks \
+		${myconf} || die "Configure failed."
+}
+
+src_compile() {
+	emake -C build
+
+	# Documentation building is currently broken.
+	#
+	# if use doc ; then
+	# 	emake -C build doc
+	# fi
+}
+
+src_install() {
+	emake -C build DESTDIR="${D}" install
+
+	dodoc AUTHORS CREDITS NEWS THANKS TRANSLATIONS
+}
+
+pkg_postinst() {
+	einfo "For the CLI version of HandBrake, you can use \`HandBrakeCLI\`."
+
+	if use gtk ; then
+		einfo ""
+		einfo "For the GTK+ version of HandBrake, you can run \`ghb\`."
+	fi
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild
index 25e77eac3064..21177544b530 100644
--- a/media-video/handbrake/handbrake-9999.ebuild
+++ b/media-video/handbrake/handbrake-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/media-video/handbrake/handbrake-9999.ebuild,v 1.4 2013/05/16 05:52:11 tomwij Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/handbrake/handbrake-9999.ebuild,v 1.5 2013/05/23 14:48:25 tomwij Exp $
 
 EAPI="5"
 
@@ -13,8 +13,8 @@ if [[ ${PV} = *9999* ]]; then
 	inherit subversion
 	KEYWORDS=""
 else
-	SRC_URI="http://dev.gentoo.org/~tomwij/files/dist/${P}.tar.gz"
-	S="${WORKDIR}"
+	SRC_URI="http://handbrake.fr/rotation.php?file=HandBrake-${PV}.tar.bz2 -> ${P}.tar.bz2"
+	S="${WORKDIR}/HandBrake-${PV}"
 	KEYWORDS="~amd64 ~x86"
 fi
 
@@ -43,7 +43,6 @@ RDEPEND="
 	media-libs/x264
 	media-sound/lame
 	ffmpeg? ( =virtual/ffmpeg-9 )
-	sys-libs/glibc:2.2
 	sys-libs/zlib
 	gstreamer? (
 		media-libs/gstreamer:1.0
diff --git a/media-video/libav/ChangeLog b/media-video/libav/ChangeLog
index 987ebefbd252..ab14b657d074 100644
--- a/media-video/libav/ChangeLog
+++ b/media-video/libav/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for media-video/libav
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.151 2013/05/21 15:55:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/ChangeLog,v 1.153 2013/05/23 11:31:22 ago Exp $
+
+  23 May 2013; Agostino Sarubbo  libav-0.8.7.ebuild:
+  Stable for amd64, wrt bug #470734
+
+  22 May 2013; Agostino Sarubbo  libav-0.8.7.ebuild:
+  Move KEYWORDS on another line because of ekeyword's failure
 
   21 May 2013; Jeroen Roovers  libav-0.8.7.ebuild:
   Stable for HPPA (bug #470734).
diff --git a/media-video/libav/Manifest b/media-video/libav/Manifest
index d8eac7c3d983..777428331afb 100644
--- a/media-video/libav/Manifest
+++ b/media-video/libav/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX libav-0.8.5-support-libcdio-paranoia.patch 1477 SHA256 2e3490bba021c512828f12dfc5e6be39a5f3c53e16b2ceb99e6f6c4e71139803 SHA512 2a9847a435a32fac0b9bd904b932d20f26a6c7b0d086cda42c45f9099d87dbd4e637c7a52e5c29ad0df69a95ffed91bad2673d773c3045f03baf736796ab8332 WHIRLPOOL 77152717b72d245e4bfd5ac0cc1ed4ac3a512086be248515bc7d0c73d4840cfae7ba3bb7a668ee354803b6fba6ad90b992f80f2c335b5173741498a968b3eca2
 DIST fate-0.8.2.tar.xz 443503168 SHA256 4c16212e4d99194e670227ccf93d54c9bb4b6f27c515626a536b87deb610d850 SHA512 eca7783af7afc567ed226942b1318b1874b2487c7dc65406fe2097cf2318d722bb4c45ed14363bc3653f948f7cdac5967162e1f4fbd5cbec1adc244886800bb1 WHIRLPOOL abe5faa67444c3edaf5ae9a57a701ba0fccd3e313941d0f7662b8dc2b3a8886578d7bcbd6ed4abfc62abe3b7a36ea216529710e28d1c9cff8f3bb2b9804707bf
@@ -10,17 +10,27 @@ DIST libav-0.8.7.tar.xz 3763180 SHA256 8be6cbee4066ea031110d0f1cf8f9fecda8bc36d8
 DIST libav-9.6.tar.xz 4068704 SHA256 03541b5c277ef7f199a440f1aedee040b94a95185aefd2bf3f0552112eea1c85 SHA512 38b873193e86dc3f1b14f2116328908bcf3e28b802b773a19f1a06eebaa2cff0bd5b571dfbe6600eb0183c8ea2b6f42b87e07eb62dc1a498d4bba9c69c68ee1b WHIRLPOOL 51847b10ba4194c4449be9cdddf9cde82c5aa528ff4dad29ba261ededc52e0d8b54282788ff637703edb6a6cdac7720a5eca89a6ad83eeca6c897e0e12c2984d
 EBUILD libav-0.8.5.ebuild 9150 SHA256 9da77bb30ebd50fef110b3c3024a09c81a28ced9daaf6576e02d0d3741451674 SHA512 10b04e57ad78906773e98748b78b12643167655fd6d81069ed9c93c9d4164a2979b9007922f1e54fbe442f1f6d0525194aa18128da63f396a7e5103670ba5c8f WHIRLPOOL f554fcd8653ad28dfeffed25a3525e4f776061d42dccec61a6b49055451f107a6651a1c13daee1101f97565c9796b2ce3b5767ca59131a011372fbd496b58a0b
 EBUILD libav-0.8.6.ebuild 9171 SHA256 14c6d38c6db77f992d35bcfeffc25ae689a7f5fff8b8ee5d7e0db7a7be7d96e5 SHA512 fa7dbed3045bcaed6daec76c8b20ca8720b3e2cea1d66ad20df918ae55cd51b3fb617f03c2e6d5d750915c03bc8e522b24e955a37c9e0a4a44b55df7851bb8f3 WHIRLPOOL f2a938dc8b02d47df1662bc4135d2e4282e555407a7820afd187d55bbb871d714a635d4a0ec3e53ab25234817e96b6b6148cd08c7ed4ff754105f2f81650bf87
-EBUILD libav-0.8.7.ebuild 9099 SHA256 527d44c9aab1cf40152868ac928ba09644478ddb2f3774e667fa30dd0336b045 SHA512 3c6f6992bd5bb36c82f519d15f93bb06a910710e37722c4c3e247d39507bdaf52776f7f9027d294ac6c75ff3fc9d99ac2c914dfcc8644208c9a246822cdd7bed WHIRLPOOL 04cc6f37a7ddc072ff9851332c7dedd6f541896cd0bb280a275e7250dbaec775d3b1d6dccc146f0945e379a6afb8bc245e317cdae1f54f50dd561d27c60b118f
+EBUILD libav-0.8.7.ebuild 9101 SHA256 891a2542b7ea8be02e03bf1a19a6f41b48d2fb422afed41131f71cd84aea412d SHA512 70466aebbbe8ca129ebe51efc04daffe846bd0f7969978e12dffa030c28ec05512b9c708c02ef8b8c932d7df2fa7bc0597b1db662ab6c780c2ebf2d20ed7fbb1 WHIRLPOOL 7982ec299b69515499415fc4bb9ecfd2979be66e3f539d2e1eb36d0657fa69502fcf0184ab87efd45b85d305b9ad65a53e1e92a24fd2f007d2da2a7785b691dc
 EBUILD libav-0.8.9999.ebuild 9110 SHA256 596fc2c01d57af2f3af6af4b45139eb766b9d43503f8874ed82bbff6a099d0e1 SHA512 1717f9cf91ab218e302c685e7f3ab0231ce731fc79c45fb5b797ce7243125317d51fd788d151742407164b49f54528408382f9672e053a09438de44132bc7ef0 WHIRLPOOL a1c93c43997b327982e24dea09a4c64189133e270528a499e8cfb9ce64dd7c86598ef212264d6f52e30dcaa1ee3ce8f60725e225aaa8f9eedc0f34832f3a4d1b
 EBUILD libav-9.6.ebuild 8876 SHA256 4eb5ab51f09bc6d28f43196acda49db992cda4ea5b07cebfd897c1b7106b6788 SHA512 b4c33200bb2b7e2edb003c955f6fa2526207525cd3f2dd99937a1008e0c8cc6dc653e742297252ad8236269dce2ce710c43c947e172faef075d9f90e641bb793 WHIRLPOOL 57b353ef40bc7415d969136a7b84228b51748adeaf88d2ec742595503edc91b4854e91b0f93ac44dabb73f75d775c20b7cd4ad715d8f44b2d38bcc7542a6f5ba
 EBUILD libav-9.9999.ebuild 8877 SHA256 783078761281e8c167c1417176854cab77612400f963235cc1b4c736351fe68a SHA512 0df6ac5afd05c0066fed08c78a88098761764bcc591b7f2b0065599b0ce455055e8d37de8e5a4588505695959fc603f46b7da875f34bfb3862fd0b33b7168f7e WHIRLPOOL 1674dc351e6b04bd276396be3f060466f2a3e6e628b862e099b4fddbca5b632e69128bdb53d1831ddcd8e5843b7ad3cf08fc41f0c8cbb330842353c06b613358
 EBUILD libav-9999.ebuild 8754 SHA256 912c110b9824153d511e1503e3405b8d486e47a732cf3c9c07c24072c186f1a4 SHA512 61675c1a70f1a6c5da363e407fe860a1a3b7cd379fb68e756b07bd15c3e4f0ad706cfd77618f72c20675ef49f2264e7a01cc2adbacda8a20086e420b443e288a WHIRLPOOL 5648de61cb35cf98f7e1a35fc5234070e14d107ad255282062db8245dafd3af198ca8abbc5ad2ad3e0de9597a96db5d734802b0c6ef7b9bba19f4eb0999d4bfc
-MISC ChangeLog 22378 SHA256 b96ce2bc8a9406810f74e5e10c56fa51968b260dab15cdadb50bde9b2f85805c SHA512 409be4f30c18ec7dd7d86af967960535e2456800ccfe8925f4422d1a4916ff64861d153dc641dd804faf6793493e064428c06d5d2305d92083cd7086a1464fa2 WHIRLPOOL c17ab8ec903e1f649c865495784af8b04adf80ec44930fb5c95fdd2da5600c6eb9d500c8c6bccc79338dd328b649951eea916bb2cc15dbd0cd0b06ad178340bf
+MISC ChangeLog 22616 SHA256 e26abd984d4ea445102ca8abe10620171308657b42540c9e7881f6a773b55a3a SHA512 2718d1a560d66ec98e215f1e49bc1908f6f941bd8733b0af314599c1ca74a3695bb15cf517612260b79125d9c2c5087ffefb9afe8482264bc041487274cec637 WHIRLPOOL b5e53f6000758d012a8d76fcca3b780193880182a12b5370c4e5e64fcbdd885551c1b0702e6a43b85a90eab90700b7fdcb4b3658a71b461d462c74fc09209b21
 MISC metadata.xml 3106 SHA256 968ffe2f92f6e2ae9963fe0005e78fc205ebca769d48eedd578472cef8c8cfcc SHA512 f10f99a54e1806b17d0923429c2df151e470edceefd854e63c0411b2be6fbbaf829e441dd318ff0e87d5f2d6985c52673646c20c971fba9c0d44d67edc3bb5c8 WHIRLPOOL 9004c95991227752427cf62491949845931683a9a45a7a555b98b1bf92cf7d2efad0e2c912b4a069e58e31f41062d0025b8e3a082e0cc37c5d13484969058a47
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGbmQ8ACgkQVWmRsqeSphPMLgCePgXbGtkmcWsz/dFwX1BoFMDR
-4eoAnjhUK6hESEA+vFWHQqLw7N5qjfDs
-=l+1r
+iQIcBAEBCgAGBQJRnf4GAAoJELp701BxlEWfj7AP/iml9HMDfCDl9f7+MjVxgB9e
+JblYwvdXdzN/hKAXCgtCDqZaKYfyvTlHcsJ7GcqVogbPs0RPLLnTvuZM+1VS1oUp
+QSTTjHcXLXZJDuw/eBrFKKta0oVDUIE++guZgF9ZrTxb1/J9EzN+lFkZZhXwFy+v
+TMAttclUUUtkB28aOnlE9skiPiIalqcnjVkSgumj/ffzE4S9qvQ80vYOXLv9Qi1Q
+aM+bD58g+m6mgKwcBPFHivC1oB2cJSNzdZJtJBweIs5peK/CxBEQF5MEvOPL9xmN
+H50d4po9wcvb7Y4ju9pWfoRXjUSr7yHrCYz2jBaJVeWa9eAqhOQtc03yXCQgNXTo
+Y1LAj6a70+43pazCwGOJPJY+MdAZSpc24ku7fhiwt2sLsmsoENLOkxrZ72DPiWd8
+IcM4tNVPf5GjB7LuEsOHjDhvr0q/2THdrJqMcbs0m5rPybAUn4VYQjB2QuvhNRfs
+GclJsuNHQhl3JK19skSnvR/8dK9c+9MJA8TkRUXyqoSNMgYVhJwekopHM4tGBn+o
+TVfZOqPH2Da6mDd5Bl/Lt0XbA4XBzhnznBFhfb7BPnqPzRlB3R65TfvBQmA3hbZT
+2uzE3l+oUH3pWLJtfFn2iiCqVk+6pwPdvuUHuUWKSzxKn806tTbj6BOyG4ZETIAn
+hR+bF2Qb2hLwKEk4MoHV
+=NqCS
 -----END PGP SIGNATURE-----
diff --git a/media-video/libav/libav-0.8.7.ebuild b/media-video/libav/libav-0.8.7.ebuild
index 8b7ab984c459..90c810644d6b 100644
--- a/media-video/libav/libav-0.8.7.ebuild
+++ b/media-video/libav/libav-0.8.7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.7.ebuild,v 1.2 2013/05/21 15:55:58 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-video/libav/libav-0.8.7.ebuild,v 1.4 2013/05/23 11:31:22 ago Exp $
 
 EAPI=5
 
@@ -26,9 +26,9 @@ SRC_URI+=" test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )"
 
 LICENSE="LGPL-2.1 gpl? ( GPL-3 )"
 SLOT="0/0.8"
-[[ ${PV} == *9999 ]] || KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64
-~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
-~x64-solaris ~x86-solaris"
+[[ ${PV} == *9999 ]] || \
+KEYWORDS="~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris"
+
 IUSE="+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection
 	  custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm
 	  +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e25f2786165e..c9c004549d3d 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2013 12:06:54 +0000
+Thu, 23 May 2013 17:06:56 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e25f2786165e..c9c004549d3d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2013 12:06:54 +0000
+Thu, 23 May 2013 17:06:56 +0000
diff --git a/metadata/md5-cache/app-admin/eselect-opengl-1.2.7 b/metadata/md5-cache/app-admin/eselect-opengl-1.2.7
index 1e6005942977..6f868875dfa5 100644
--- a/metadata/md5-cache/app-admin/eselect-opengl-1.2.7
+++ b/metadata/md5-cache/app-admin/eselect-opengl-1.2.7
@@ -3,10 +3,10 @@ DEPEND=app-arch/xz-utils
 DESCRIPTION=Utility to change the OpenGL interface being used
 EAPI=4
 HOMEPAGE=http://www.gentoo.org/
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.4 !=dev-libs/openssl-0.9.6d ) sys-devel/libtool || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A HTTP regression testing and benchmarking utility
+EAPI=4
+HOMEPAGE=http://www.joedog.org/JoeDog/Siege
+IUSE=ssl
+KEYWORDS=~amd64 ~hppa ~mips ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=ssl? ( >=dev-libs/openssl-0.9.6d )
+SLOT=0
+SRC_URI=http://www.joedog.org/pub/siege/siege-3.0.1.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=4ca091be2f33f0a787ce13592bace6d8
diff --git a/metadata/md5-cache/app-emacs/evil-1.0.2 b/metadata/md5-cache/app-emacs/evil-1.0.2
new file mode 100644
index 000000000000..d6df1a46c644
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/evil-1.0.2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DEPEND=app-emacs/undo-tree >=virtual/emacs-21
+DESCRIPTION=Extensible vi layer for Emacs
+EAPI=5
+HOMEPAGE=http://gitorious.org/evil
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+ FDL-1.3+
+RDEPEND=app-emacs/undo-tree >=virtual/emacs-21
+SLOT=0
+SRC_URI=mirror://gentoo/evil-1.0.2.tar.xz
+_eclasses_=elisp	ae11b438eee6c692e6c94c9a86999514	elisp-common	090a78f3eaf8f79b5c038c950c6fbaf7	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1faa4989b145550c62bde4eaa5aebf99
diff --git a/metadata/md5-cache/app-emulation/libvirt-1.0.0 b/metadata/md5-cache/app-emulation/libvirt-1.0.0
deleted file mode 100644
index b3bcb10c0793..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-1.0.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup test
-DEPEND=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 ) 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-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=4
-HOMEPAGE=http://www.libvirt.org/
-IUSE=audit avahi +caps firewalld 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
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-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 ) 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 =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-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=5
-HOMEPAGE=http://www.libvirt.org/
-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
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-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 =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-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=5
-HOMEPAGE=http://www.libvirt.org/
-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
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-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 =net-misc/curl-7.18.0 dev-libs/libgc
 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 )
 SLOT=0
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	git-2	e92e09651292b1bef5656592364550f7	libtool	b1c8688e60f9580bcb9bb46e08737eb1	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=5425111b9953a395947f0059a83b2021
+_md5_=ca9e8a4f0bf3374057ff39fe9e496f30
diff --git a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r2 b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r2
index d432d198b18d..86f07a02ce66 100644
--- a/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r2
+++ b/metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst prepare setup
-DEPEND=sys-devel/gettext || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DEPEND=sys-devel/gettext dev-libs/yajl || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 DESCRIPTION=allows to boot Xen domU kernels from a menu.lst laying inside guest filesystem
 EAPI=4
 HOMEPAGE=http://xen.org/
@@ -10,4 +10,4 @@ RDEPEND=>=app-emulation/xen-4.2.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.
 SLOT=0
 SRC_URI=http://bits.xensource.com/oss-xen/release/4.2.1/xen-4.2.1.tar.gz mirror://gnu-alpha/grub/grub-0.97.tar.gz http://xenbits.xensource.com/xen-extfiles/zlib-1.2.3.tar.gz ftp://atrey.karlin.mff.cuni.cz/pub/linux/pci/pciutils-2.2.9.tar.bz2 http://xenbits.xensource.com/xen-extfiles/lwip-1.3.0.tar.gz http://xenbits.xensource.com/xen-extfiles/newlib/newlib-1.16.0.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6988f88ea41566467c90b1f3ce7d26f2
+_md5_=955caceecf56b3c2eb277130cac356f6
diff --git a/metadata/md5-cache/app-i18n/transifex-client-0.9 b/metadata/md5-cache/app-i18n/transifex-client-0.9
new file mode 100644
index 000000000000..960b7dfccb15
--- /dev/null
+++ b/metadata/md5-cache/app-i18n/transifex-client-0.9
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install postinst postrm prepare
+DEPEND==dev-lang/python-2*
+DESCRIPTION=A command line interface for Transifex
+EAPI=3
+HOMEPAGE=http://pypi.python.org/pypi/transifex-client http://www.transifex.net/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND==dev-lang/python-2*
+SLOT=0
+SRC_URI=https://pypi.python.org/packages/source/t/transifex-client/transifex-client-0.9.tar.gz
+_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=1f2ca08bed958d66d85f5d59fcb37d20
diff --git a/metadata/md5-cache/app-misc/gramps-3.4.5 b/metadata/md5-cache/app-misc/gramps-3.4.5
new file mode 100644
index 000000000000..74d55cd1e57f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/gramps-3.4.5
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
+DEPEND=dev-python/bsddb3 >=dev-python/pygtk-2.16.0 dev-python/pygoocanvas x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) dev-util/intltool sys-devel/gettext virtual/libiconv virtual/pkgconfig >=sys-apps/sed-4 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+DESCRIPTION=Genealogical Research and Analysis Management Programming System
+EAPI=3
+HOMEPAGE=http://www.gramps-project.org/
+IUSE=gnome reports spell webkit
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-python/bsddb3 >=dev-python/pygtk-2.16.0 dev-python/pygoocanvas x11-misc/xdg-utils gnome-base/librsvg:2 gnome? ( dev-python/libgnome-python dev-python/gconf-python ) spell? ( dev-python/gtkspell-python ) reports? ( media-gfx/graphviz ) webkit? ( dev-python/pywebkitgtk ) || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
+SLOT=0
+SRC_URI=mirror://sourceforge/gramps/Stable/3.4.5/gramps-3.4.5.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=279ad4854b8d67316b1def8de7ccb98c
diff --git a/metadata/md5-cache/app-misc/jq-1.3 b/metadata/md5-cache/app-misc/jq-1.3
new file mode 100644
index 000000000000..28b5c00348d3
--- /dev/null
+++ b/metadata/md5-cache/app-misc/jq-1.3
@@ -0,0 +1,12 @@
+DEFINED_PHASES=prepare
+DEPEND=sys-devel/bison sys-devel/flex test? ( dev-util/valgrind ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A lightweight and flexible command-line JSON processor
+EAPI=5
+HOMEPAGE=http://stedolan.github.com/jq/
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT CC-BY-3.0
+SLOT=0
+SRC_URI=http://stedolan.github.io/jq/download/source/jq-1.3.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=4575ff39093d05e192ec54eb44bbbcf1
diff --git a/metadata/md5-cache/app-text/libodfgen-0.0.1 b/metadata/md5-cache/app-text/libodfgen-0.0.2
similarity index 84%
rename from metadata/md5-cache/app-text/libodfgen-0.0.1
rename to metadata/md5-cache/app-text/libodfgen-0.0.2
index 84188ed8594a..2c69d7c56aaa 100644
--- a/metadata/md5-cache/app-text/libodfgen-0.0.1
+++ b/metadata/md5-cache/app-text/libodfgen-0.0.2
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
 LICENSE=|| ( LGPL-2.1 MPL-2.0 )
 RDEPEND=app-text/libwpd app-text/libwpg
 SLOT=0
-SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.0.1.tar.xz
+SRC_URI=mirror://sourceforge/libwpd/libodfgen-0.0.2.tar.xz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=69d03a1119067937bf79a0540c972196
+_md5_=6aedb49cb2dcd3cb80fe0b75f90dd8ef
diff --git a/metadata/md5-cache/app-text/pastebinit-1.3.1-r1 b/metadata/md5-cache/app-text/pastebinit-1.3.1-r1
index f52a9f94e99a..b7b404cd00f9 100644
--- a/metadata/md5-cache/app-text/pastebinit-1.3.1-r1
+++ b/metadata/md5-cache/app-text/pastebinit-1.3.1-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A software that lets you send anything you want directly to a pasteb
 EAPI=5
 HOMEPAGE=https://launchpad.net/pastebinit
 IUSE=crypt python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
 RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6[xml] ) python_targets_python2_7? ( dev-lang/python:2.7[xml] ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-)] crypt? ( app-crypt/gnupg )
 SLOT=0
 SRC_URI=https://launchpad.net/pastebinit/trunk/1.3.1/+download/pastebinit-1.3.1.tar.bz2
 _eclasses_=multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=ba0d8d52fd7deea64bcac01516a9fd87
+_md5_=6757570d88472a0f99946e6307778150
diff --git a/metadata/md5-cache/app-text/qpdfview-0.4.2-r1 b/metadata/md5-cache/app-text/qpdfview-0.4.2-r1
index a4204cbfe27d..67cbace99d59 100644
--- a/metadata/md5-cache/app-text/qpdfview-0.4.2-r1
+++ b/metadata/md5-cache/app-text/qpdfview-0.4.2-r1
@@ -4,10 +4,10 @@ DESCRIPTION=A tabbed document viewer
 EAPI=5
 HOMEPAGE=http://launchpad.net/qpdfview
 IUSE=cups dbus djvu +pdf postscript sqlite +svg synctex linguas_ast linguas_az linguas_bg linguas_bs linguas_ca linguas_cs linguas_da linguas_de linguas_el linguas_en_GB linguas_eo linguas_es linguas_eu linguas_fi linguas_fr linguas_he linguas_hr linguas_id linguas_it linguas_ky linguas_ms linguas_my linguas_pl linguas_pt_BR linguas_ro linguas_ru linguas_sk linguas_tr linguas_ug linguas_uk linguas_zh_CN
-KEYWORDS=~amd64 ~arm ~x86
+KEYWORDS=~amd64 arm ~x86
 LICENSE=GPL-2
 RDEPEND=app-text/poppler[qt4] dev-qt/qtcore:4[iconv] dev-qt/qtgui:4 cups? ( net-print/cups ) dbus? ( dev-qt/qtdbus:4 ) djvu? ( app-text/djvu ) postscript? ( app-text/libspectre ) sqlite? ( dev-qt/qtsql:4[sqlite] ) svg? ( dev-qt/qtsvg:4 ) !svg? ( virtual/freedesktop-icon-theme )
 SLOT=0
 SRC_URI=https://launchpad.net/qpdfview/trunk/0.4.2/+download/qpdfview-0.4.2.tar.gz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	l10n	33bde4fb0cfd3a21a277b66bfd837e19	multilib	892e597faee02a5b94eb02ab512e7622	qt4-r2	f735f67b3de93a007dbdec708b481831	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=3cc13a8f6c5e5cfff285f55a0e1fb3e9
+_md5_=8ab3806d7c48647a7fe0d5f8cfad3dbd
diff --git a/metadata/md5-cache/app-text/sword-1.6.2 b/metadata/md5-cache/app-text/sword-1.6.2
index 3090ab4686e4..9cbd31cb0aaa 100644
--- a/metadata/md5-cache/app-text/sword-1.6.2
+++ b/metadata/md5-cache/app-text/sword-1.6.2
@@ -7,7 +7,8 @@ IUSE=curl debug doc icu static-libs
 KEYWORDS=amd64 ppc x86 ~x86-fbsd ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=sys-libs/zlib curl? ( net-misc/curl ) icu? ( dev-libs/icu:= )
+RESTRICT=test
 SLOT=0
 SRC_URI=http://www.crosswire.org/ftpmirror/pub/sword/source/v1.6/sword-1.6.2.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fada23e6949b7a53ac1d031a72bd9b32
+_md5_=fb1a2b5b5a541c2df8d10ea94d88f3f6
diff --git a/metadata/md5-cache/dev-java/icedtea-6.1.12.5 b/metadata/md5-cache/dev-java/icedtea-6.1.12.5
new file mode 100644
index 000000000000..1f1770785e80
--- /dev/null
+++ b/metadata/md5-cache/dev-java/icedtea-6.1.12.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm setup test unpack
+DEPEND=>=media-libs/giflib-4.1.6 >=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 ) >=media-libs/alsa-lib-1.0 >=net-print/cups-1.2.12 dev-libs/glib >=media-libs/freetype-2.3.5 >=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 || ( >=dev-java/gcj-jdk-4.3 dev-java/icedtea-bin:6 dev-java/icedtea:6 ) app-arch/cpio app-arch/unzip app-arch/zip app-misc/ca-certificates >=dev-java/ant-core-1.8.1 dev-java/ant-nodeps dev-lang/perl >=dev-libs/libxslt-1.1.26 dev-libs/openssl virtual/pkgconfig sys-apps/lsb-release >=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 pax_kernel? ( sys-apps/paxctl ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java =media-libs/giflib-4.1.6 >=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 ) !dev-java/icedtea6 X? ( dev-libs/glib >=media-libs/freetype-2.3.5 >=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 media-fonts/dejavu cjk? ( media-fonts/arphicfonts media-fonts/baekmuk-fonts !ppc? ( !ppc64? ( media-fonts/lklug ) ) media-fonts/lohit-fonts media-fonts/sazanami ) ) alsa? ( >=media-libs/alsa-lib-1.0 ) cups? ( >=net-print/cups-1.2.12 ) >=dev-java/java-config-2.1.9-r1 =dev-java/java-config-2* || ( app-admin/eselect-java  icedtea-1.12-cacao-68fe50ac34ec.tar.gz http://icedtea.classpath.org/download/drops/jamvm/jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz -> icedtea-1.12-jamvm-0972452d441544f7dd29c55d64f1ce3a5db90d82.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	java-vm-2	7dc6db7d110230640003e30e63a0b2bc	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	prefix	21058c21ca48453d771df15500873ede	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=5e1e0f271855617fdce1ae6a10644482
diff --git a/metadata/md5-cache/dev-java/jfreechart-1.0.14 b/metadata/md5-cache/dev-java/jfreechart-1.0.14
new file mode 100644
index 000000000000..1df8004a358f
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jfreechart-1.0.14
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.4 >=dev-java/itext-2.1.5:0 >=dev-java/jcommon-1.0.17:1.0 servlet? ( java-virtuals/servlet-api:2.3 ) test? ( dev-java/ant-junit:0 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2 >=dev-lang/python-2.4
+DESCRIPTION=JFreeChart is a free Java class library for generating charts
+EAPI=5
+HOMEPAGE=http://www.jfree.org/jfreechart
+IUSE=+servlet test elibc_FreeBSD doc source elibc_FreeBSD
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-2.1
+RDEPEND=>=virtual/jdk-1.4 >=dev-java/itext-2.1.5:0 >=dev-java/jcommon-1.0.17:1.0 servlet? ( java-virtuals/servlet-api:2.3 ) >=dev-java/java-config-2.1.9-r1 source? ( app-arch/zip )
+SLOT=1.0
+SRC_URI=mirror://sourceforge/jfreechart/jfreechart-1.0.14.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-ant-2	65ba8d80c13cf56bad5ccec21a6b3c37	java-pkg-2	65bbb59987d777c1106ae8aa4bf36e7b	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=2877aa7c7f63f70c3b7cfaffebe43dbb
diff --git a/metadata/md5-cache/dev-lang/R-3.0.1 b/metadata/md5-cache/dev-lang/R-3.0.1
new file mode 100644
index 000000000000..31dcb81fa789
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/R-3.0.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) virtual/pkgconfig doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/fortran
+DESCRIPTION=Language and environment for statistical computing and graphics
+EAPI=5
+HOMEPAGE=http://www.r-project.org/
+IUSE=bash-completion cairo doc icu java jpeg lapack minimal nls openmp perl png prefix profile readline static-libs tiff tk X
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-fbsd ~x86-linux ~x64-macos
+LICENSE=|| ( GPL-2 GPL-3 ) LGPL-2.1
+RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre virtual/blas cairo? ( x11-libs/cairo[X] x11-libs/pango ) icu? ( dev-libs/icu ) jpeg? ( virtual/jpeg ) lapack? ( virtual/lapack ) perl? ( dev-lang/perl ) png? ( media-libs/libpng ) readline? ( sys-libs/readline ) tk? ( dev-lang/tk ) X? ( x11-libs/libXmu x11-misc/xdg-utils ) ( || ( =sys-libs/zlib-1.2.5.1-r2[minizip] ) ) app-arch/xz-utils java? ( >=virtual/jre-1.5 ) virtual/fortran
+REQUIRED_USE=png? ( || ( cairo X ) ) jpeg? ( || ( cairo X ) ) tiff? ( || ( cairo X ) )
+RESTRICT=minimal? ( test )
+SLOT=0
+SRC_URI=mirror://cran/src/base/R-3/R-3.0.1.tar.gz bash-completion? ( http://dev.gentoo.org/~bicatali/distfiles/R-20130129.bash_completion.bz2 )
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	bash-completion-r1	fcc2dafb65a2b662dd4b076f2103f6a6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	fortran-2	ea80967500d9deda5468aed13b0bfca8	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=bd2d8bc9f6663e53492da9d247eb7580
diff --git a/metadata/md5-cache/dev-libs/geoip-1.5.0 b/metadata/md5-cache/dev-libs/geoip-1.5.0
index b4207aefde9d..2134dc0165df 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.5.0
+++ b/metadata/md5-cache/dev-libs/geoip-1.5.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=sys-libs/zlib
 DESCRIPTION=easily lookup countries by IP addresses, even when Reverse DNS entries don't exist
 EAPI=5
-HOMEPAGE=http://www.maxmind.com/app/ip-location
+HOMEPAGE=http://dev.maxmind.com/geoip/legacy/downloadable
 IUSE=city ipv6 perl-geoipupdate static-libs
 KEYWORDS=~alpha amd64 arm hppa ia64 ppc ~ppc64 s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1 GPL-2 MaxMind2
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib perl-geoipupdate? ( dev-perl/PerlIO-gzip dev-perl/libwww-p
 SLOT=0
 SRC_URI=http://www.maxmind.com/download/geoip/api/c/GeoIP-1.5.0.tar.gz http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz ) ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz ) )
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c54d43e3922c7f4684f81e5c3915349b
+_md5_=19111356bc883dce7ac0522d488a7226
diff --git a/metadata/md5-cache/dev-libs/geoip-1.5.0-r1 b/metadata/md5-cache/dev-libs/geoip-1.5.0-r1
index eff8db0171bf..77a563789415 100644
--- a/metadata/md5-cache/dev-libs/geoip-1.5.0-r1
+++ b/metadata/md5-cache/dev-libs/geoip-1.5.0-r1
@@ -2,7 +2,7 @@ DEFINED_PHASES=configure install prepare
 DEPEND=sys-libs/zlib
 DESCRIPTION=easily lookup countries by IP addresses, even when Reverse DNS entries don't exist
 EAPI=5
-HOMEPAGE=http://www.maxmind.com/app/ip-location
+HOMEPAGE=http://dev.maxmind.com/geoip/legacy/downloadable
 IUSE=city ipv6 perl-geoipupdate static-libs
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-macos
 LICENSE=LGPL-2.1 GPL-2 MaxMind2
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/zlib perl-geoipupdate? ( dev-perl/PerlIO-gzip dev-perl/libwww-p
 SLOT=0
 SRC_URI=http://www.maxmind.com/download/geoip/api/c/GeoIP-1.5.0.tar.gz http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz ) ipv6? ( http://geolite.maxmind.com/download/geoip/database/GeoIPv6.dat.gz city? ( http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz ) )
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=fc7e06eab66265c6c8cd50e5fd7ec556
+_md5_=dd78cb3364e60cdb8da66564b6b6ee13
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.16 b/metadata/md5-cache/dev-libs/libnl-3.2.16
deleted file mode 100644
index 44face2ffc1e..000000000000
--- a/metadata/md5-cache/dev-libs/libnl-3.2.16
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/flex sys-devel/bison
-DESCRIPTION=A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces
-EAPI=4
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/
-IUSE=doc static-libs utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )
-SLOT=3
-SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.16.tar.gz doc? ( http://www.infradead.org/~tgr/libnl/files/libnl-doc-3.2.16.tar.gz )
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2b0049314328a480e443942050e9b2d3
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.18 b/metadata/md5-cache/dev-libs/libnl-3.2.18
deleted file mode 100644
index 95cdfa56248c..000000000000
--- a/metadata/md5-cache/dev-libs/libnl-3.2.18
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/flex sys-devel/bison
-DESCRIPTION=A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces
-EAPI=4
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/
-IUSE=doc static-libs utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )
-SLOT=3
-SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.18.tar.gz doc? ( http://www.infradead.org/~tgr/libnl/files/libnl-doc-3.2.18.tar.gz )
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e3f49e7e801f3d95e47cf5c5cb3dcd69
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.19 b/metadata/md5-cache/dev-libs/libnl-3.2.19
deleted file mode 100644
index a6c569e87be4..000000000000
--- a/metadata/md5-cache/dev-libs/libnl-3.2.19
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/flex sys-devel/bison
-DESCRIPTION=A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces
-EAPI=4
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/
-IUSE=doc static-libs utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )
-SLOT=3
-SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.19.tar.gz doc? ( http://www.infradead.org/~tgr/libnl/files/libnl-doc-3.2.19.tar.gz )
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=ac9985b3b15e809400d6f41bf0ca66a8
diff --git a/metadata/md5-cache/dev-libs/libnl-3.2.20 b/metadata/md5-cache/dev-libs/libnl-3.2.20
deleted file mode 100644
index 3533ea55485c..000000000000
--- a/metadata/md5-cache/dev-libs/libnl-3.2.20
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=sys-devel/flex sys-devel/bison
-DESCRIPTION=A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces
-EAPI=4
-HOMEPAGE=http://www.infradead.org/~tgr/libnl/
-IUSE=doc static-libs utils
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux
-LICENSE=LGPL-2.1 doc? ( GPL-2 ) utils? ( GPL-2 )
-SLOT=3
-SRC_URI=http://www.infradead.org/~tgr/libnl/files/libnl-3.2.20.tar.gz doc? ( http://www.infradead.org/~tgr/libnl/files/libnl-doc-3.2.20.tar.gz )
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=afdd229143b6e2c6aaf973aabb0c4b4a
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r1 b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r1
index a1f0f989aea4..9e19127fee54 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r1
@@ -3,10 +3,10 @@ DEPEND==dev-lang/python-3*
 DESCRIPTION=HTML/XML parser for quick-turnaround applications like screen-scraping.
 EAPI=3
 HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
 LICENSE=BSD
 RDEPEND=!dev-python/beautifulsoup:0 =dev-lang/python-3*
 SLOT=python-3
 SRC_URI=http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup-3.1.0.1.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=04c725221a5c5987f770fff43996ba26
+_md5_=a2ae008276a9217ff0502115b7d86c3e
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2 b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
new file mode 100644
index 000000000000..4b4da1ed38d3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=HTML/XML parser for quick-turnaround applications like screen-scraping.
+EAPI=5
+HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup
+IUSE=python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=!dev-python/beautifulsoup:0 python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
+SLOT=python-3
+SRC_URI=http://www.crummy.com/software/BeautifulSoup/download/BeautifulSoup-3.1.0.1.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=78e7c1e63214fd263f59a6b5c3eda2a1
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1 b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
index beb30696dd04..f630e36e6227 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
@@ -4,11 +4,11 @@ DESCRIPTION=HTML/XML parser for quick-turnaround applications like screen-scrapi
 EAPI=5
 HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/BeautifulSoup
 IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=BSD
 RDEPEND=!dev-python/beautifulsoup:0 python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=python-2
 SRC_URI=http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8093b87151bd32b3b3a69fcf215dec67
+_md5_=26a53f56ae5d76c289b89a58e26767b4
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1 b/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
index e8afd3e89312..5da5906d6c23 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targe
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.1.3.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=4fbea1533fbe17eca81c6c0c6a68f9e4
+_md5_=05b191b7d5a664cef8c2ebd69a594141
diff --git a/metadata/md5-cache/dev-python/beautifulsoup-4.2.0 b/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
index dc7ee587aae0..29d77dc7b703 100644
--- a/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
+++ b/metadata/md5-cache/dev-python/beautifulsoup-4.2.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/lxml[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=doc? ( dev-python/sphinx[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] ) test? ( dev-python/nose[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)] dev-python/lxml[python_targets_python3_1(-)?,-python_single_target_python3_1(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
 DESCRIPTION=Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree
 EAPI=5
 HOMEPAGE=http://www.crummy.com/software/BeautifulSoup/ http://pypi.python.org/pypi/beautifulsoup4
-IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
+RDEPEND=python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy2_0 )
 SLOT=4
 SRC_URI=mirror://pypi/b/beautifulsoup4/beautifulsoup4-4.2.0.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=239145f6a4c39f0621eea474ad86c87f
+_md5_=d464b6a6aa9450e68bad24e66b2ff9df
diff --git a/metadata/md5-cache/dev-python/cython-0.14.1 b/metadata/md5-cache/dev-python/cython-0.14.1
deleted file mode 100644
index a906527a31c9..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.14.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-lang/python
-DESCRIPTION=The Cython compiler for writing C extensions for the Python language
-EAPI=3
-HOMEPAGE=http://www.cython.org/ http://pypi.python.org/pypi/Cython
-IUSE=doc examples
-KEYWORDS=amd64 ~arm hppa ~ia64 ppc ppc64 ~sparc x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=http://www.cython.org/release/Cython-0.14.1.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=9f86446261668e9342a1beac9f8b90e6
diff --git a/metadata/md5-cache/dev-python/cython-0.14.1-r1 b/metadata/md5-cache/dev-python/cython-0.14.1-r1
deleted file mode 100644
index 1d2ee367c9cf..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.14.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-lang/python
-DESCRIPTION=The Cython compiler for writing C extensions for the Python language
-EAPI=3
-HOMEPAGE=http://www.cython.org/ http://pypi.python.org/pypi/Cython
-IUSE=doc examples
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/python
-SLOT=0
-SRC_URI=http://www.cython.org/release/Cython-0.14.1.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=dfdfd084aaddaa72b202fbab7aa38c1d
diff --git a/metadata/md5-cache/dev-python/cython-0.15.1-r1 b/metadata/md5-cache/dev-python/cython-0.15.1-r1
deleted file mode 100644
index 2c32381da38c..000000000000
--- a/metadata/md5-cache/dev-python/cython-0.15.1-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=numpy? ( >=dev-python/numpy-1.6.1-r1 ) dev-lang/python
-DESCRIPTION=Compiler for writing C extensions for the Python language
-EAPI=3
-HOMEPAGE=http://www.cython.org/ http://pypi.python.org/pypi/Cython
-IUSE=doc examples numpy
-KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=numpy? ( >=dev-python/numpy-1.6.1-r1 ) dev-lang/python
-SLOT=0
-SRC_URI=http://www.cython.org/release/Cython-0.15.1.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=aa209792e3861270350dad56a15950d1
diff --git a/metadata/md5-cache/dev-python/cython-0.19 b/metadata/md5-cache/dev-python/cython-0.19
new file mode 100644
index 000000000000..897ddd81de08
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cython-0.19
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( dev-python/sphinx ) test? ( >=dev-python/numpy-1.6.1-r1[python_targets_python2_5(-)?,-python_single_target_python2_5(-),python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_1(-)?,-python_single_target_python3_1(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=A Python to C compiler
+EAPI=5
+HOMEPAGE=http://www.cython.org/ http://pypi.python.org/pypi/Cython
+IUSE=doc test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=http://www.cython.org/release/Cython-0.19.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ed46ef946beec59ea3a4a25ba6c008b8
diff --git a/metadata/md5-cache/dev-python/django-pipeline-1.3.9 b/metadata/md5-cache/dev-python/django-pipeline-1.3.9
index 630420dc9ccf..75125c39264c 100644
--- a/metadata/md5-cache/dev-python/django-pipeline-1.3.9
+++ b/metadata/md5-cache/dev-python/django-pipeline-1.3.9
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] test? ( dev-python/futures[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/futures[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jsmin[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 DESCRIPTION=An asset packaging library for Django
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/django-pipeline/
 IUSE=doc test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
-RDEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+RDEPEND=>=dev-python/django-1.4.1[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/futures[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/jsmin[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/d/django-pipeline/django-pipeline-1.3.9.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=373ed3ab31117fa9f5b5a911ce665c13
+_md5_=ad8e3e593f93edc3ceb68251595682ce
diff --git a/metadata/md5-cache/dev-python/flask-0.9-r2 b/metadata/md5-cache/dev-python/flask-0.9-r2
new file mode 100644
index 000000000000..db3da72ea475
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-0.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/blinker[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.4[python_targets_python2_5(-)?,-python_single_target_python2_5(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy1_9(-)?,-python_single_target_pypy1_9(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/werkzeug-0.6.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/Flask
+IUSE=examples test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/blinker[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.4[python_targets_python2_5(-)?,-python_single_target_python2_5(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy1_9(-)?,-python_single_target_pypy1_9(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/werkzeug-0.6.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask/Flask-0.9.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a6451fde7c65f5d78c66983ae0de1c2f
diff --git a/metadata/md5-cache/dev-python/flask-9999 b/metadata/md5-cache/dev-python/flask-9999
index 447a1f73d6ba..5c5e7f20dc19 100644
--- a/metadata/md5-cache/dev-python/flask-9999
+++ b/metadata/md5-cache/dev-python/flask-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-python/blinker[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.4[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/werkzeug-0.6.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-vcs/git
+DEPEND=dev-python/blinker[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.4[python_targets_python2_5(-)?,-python_single_target_python2_5(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy1_9(-)?,-python_single_target_pypy1_9(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/werkzeug-0.6.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-vcs/git
 DESCRIPTION=A microframework based on Werkzeug, Jinja2 and good intentions
 EAPI=5
 HOMEPAGE=http://pypi.python.org/pypi/Flask
 IUSE=examples test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
 LICENSE=BSD
-RDEPEND=dev-python/blinker[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.4[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/werkzeug-0.6.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+RDEPEND=dev-python/blinker[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.4[python_targets_python2_5(-)?,-python_single_target_python2_5(-)] >=dev-python/jinja-2.4[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_pypy1_9(-)?,-python_single_target_pypy1_9(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/werkzeug-0.6.1[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	git-2	e92e09651292b1bef5656592364550f7	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e64d377b18da8bab5003b3e5295dd7c8
+_md5_=ea033178acdbc988be4b9a3edff87e1b
diff --git a/metadata/md5-cache/dev-python/html5lib-0.95-r1 b/metadata/md5-cache/dev-python/html5lib-0.95-r1
index 1920b54ce634..ac5f405af579 100644
--- a/metadata/md5-cache/dev-python/html5lib-0.95-r1
+++ b/metadata/md5-cache/dev-python/html5lib-0.95-r1
@@ -4,11 +4,11 @@ DESCRIPTION=HTML parser based on the HTML5 specification
 EAPI=5
 HOMEPAGE=http://code.google.com/p/html5lib/ http://pypi.python.org/pypi/html5lib
 IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~x86-fbsd
+KEYWORDS=~amd64 ~arm ~hppa ~ppc ~x86 ~x86-fbsd
 LICENSE=MIT
 RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5[xml(+)] ) python_targets_python2_6? ( dev-lang/python:2.6[xml(+)] ) python_targets_python2_7? ( dev-lang/python:2.7[xml(+)] ) python_targets_pypy1_9? ( dev-python/pypy:1.9[xml(+)] ) python_targets_pypy2_0? ( dev-python/pypy:2.0[xml(+)] ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy1_9 python_targets_pypy2_0 )
 SLOT=0
 SRC_URI=http://html5lib.googlecode.com/files/html5lib-0.95.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=32e3d4872cb30e718cb02767633504f0
+_md5_=d644d03502037889f8926979b7b30876
diff --git a/metadata/md5-cache/dev-python/jinja-2.6-r100 b/metadata/md5-cache/dev-python/jinja-2.6-r100
new file mode 100644
index 000000000000..c7e9a3f99397
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jinja-2.6-r100
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=dev-python/markupsafe[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] !=dev-python/sphinx-0.6 ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)]
+DESCRIPTION=A small but fast and easy to use stand-alone template engine written in pure Python
+EAPI=5
+HOMEPAGE=http://jinja.pocoo.org/ http://pypi.python.org/pypi/Jinja2
+IUSE=doc examples python_targets_python2_5 python_targets_python3_1 python_targets_python3_2
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris
+LICENSE=BSD
+RDEPEND=dev-python/markupsafe[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,-python_single_target_python2_5(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-)] !=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 dev-python/beautifulsoup[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) dev-python/setuptools[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 DESCRIPTION=A Pythonic binding for the libxml2 and libxslt libraries
 EAPI=5
 HOMEPAGE=http://lxml.de/ http://pypi.python.org/pypi/lxml/
-IUSE=doc examples +threads python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
+IUSE=beautifulsoup3 doc examples +threads python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD ElementTree GPL-2 PSF-2
-RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 dev-python/beautifulsoup[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+RDEPEND=>=dev-libs/libxml2-2.7.2 >=dev-libs/libxslt-1.1.15 beautifulsoup3? ( python_targets_python2_6? ( dev-python/beautifulsoup:python-2[python_targets_python2_6] ) python_targets_python2_7? ( dev-python/beautifulsoup:python-2[python_targets_python2_7] ) python_targets_python3_1? ( dev-python/beautifulsoup:python-3[python_targets_python3_1] ) python_targets_python3_2? ( dev-python/beautifulsoup:python-3[python_targets_python3_2] ) python_targets_python3_3? ( dev-python/beautifulsoup:python-3[python_targets_python3_3] ) ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
 REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 )
 SLOT=0
 SRC_URI=mirror://pypi/l/lxml/lxml-3.2.1.tar.gz
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e0d37f80255f6242997a1ef22528c840
+_md5_=ee2f27c73416f7711ab9e5b647c05519
diff --git a/metadata/md5-cache/dev-python/ply-3.4 b/metadata/md5-cache/dev-python/ply-3.4
index c030377c3538..5da548bbe0f6 100644
--- a/metadata/md5-cache/dev-python/ply-3.4
+++ b/metadata/md5-cache/dev-python/ply-3.4
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst postrm prepare test
-DEPEND=dev-python/ply dev-lang/python
+DEPEND=dev-python/setuptools dev-lang/python
 DESCRIPTION=Python Lex-Yacc library
 EAPI=3
 HOMEPAGE=http://www.dabeaz.com/ply/ http://pypi.python.org/pypi/ply
@@ -10,4 +10,4 @@ RDEPEND=dev-lang/python
 SLOT=0
 SRC_URI=http://www.dabeaz.com/ply/ply-3.4.tar.gz
 _eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=4e69e512279f6841507c4ef0fbb53693
+_md5_=e41377b57ee58848d10e1798610c0d35
diff --git a/metadata/md5-cache/dev-python/py-1.4.14 b/metadata/md5-cache/dev-python/py-1.4.14
new file mode 100644
index 000000000000..ce3b37c69652
--- /dev/null
+++ b/metadata/md5-cache/dev-python/py-1.4.14
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] test? ( >=dev-python/pytest-2[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=library with cross-python path, ini-parsing, io, code, log facilities
+EAPI=5
+HOMEPAGE=http://pylib.readthedocs.org/ http://pypi.python.org/pypi/py
+IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x86-macos
+LICENSE=MIT
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/p/py/py-1.4.14.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e9be4ceb6e0cd34d693071a98d60c850
diff --git a/metadata/md5-cache/dev-python/python-memcached-1.48-r1 b/metadata/md5-cache/dev-python/python-memcached-1.48-r1
new file mode 100644
index 000000000000..6454112b296d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-memcached-1.48-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)] test? ( net-misc/memcached ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Pure python memcached client
+EAPI=5
+HOMEPAGE=http://www.tummy.com/Community/software/python-memcached/ http://pypi.python.org/pypi/python-memcached
+IUSE=test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=OSL-2.0
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=ftp://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.48.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=e3237c57aafb572f09cd4affb7efec6d
diff --git a/metadata/md5-cache/dev-python/rdflib-4.0.1 b/metadata/md5-cache/dev-python/rdflib-4.0.1
new file mode 100644
index 000000000000..cd394d5c6bae
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rdflib-4.0.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/isodate[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/html5lib[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pyparsing[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] berkdb? ( dev-python/bsddb3 ) mysql? ( dev-python/mysql-python[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python] ) dev-python/setuptools test? ( dev-python/sparql-wrapper[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+DESCRIPTION=RDF library containing a triple store and parser/serializer
+EAPI=5
+HOMEPAGE=https://github.com/RDFLib/rdflib http://pypi.python.org/pypi/rdflib
+IUSE=berkdb examples mysql redland sqlite test python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/isodate[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] dev-python/html5lib[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] virtual/pyparsing[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)] berkdb? ( dev-python/bsddb3 ) mysql? ( dev-python/mysql-python[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) redland? ( dev-libs/redland-bindings[python] ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-)]
+REQUIRED_USE=|| ( python_targets_python2_6 python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 )
+SLOT=0
+SRC_URI=mirror://pypi/r/rdflib/rdflib-4.0.1.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=a2f939d4348a29a633045a897de0648c
diff --git a/metadata/md5-cache/dev-python/sphinx-1.1.3-r7 b/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
new file mode 100644
index 000000000000..0911c8141bcd
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-1.1.3-r7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DEPEND=test? ( dev-python/nose[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Python documentation generator
+EAPI=5
+HOMEPAGE=http://sphinx.pocoo.org/ http://pypi.python.org/pypi/Sphinx
+IUSE=doc latex test python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD
+RDEPEND=>=dev-python/docutils-0.7[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] >=dev-python/jinja-2.3[python_targets_python2_5(-)?,-python_single_target_python2_5(-),python_targets_python3_1(-)?,-python_single_target_python3_1(-),python_targets_python3_2(-)?,-python_single_target_python3_2(-)] >=dev-python/jinja-2.3[python_targets_python2_6(-)?,-python_single_target_python2_6(-),python_targets_python2_7(-)?,-python_single_target_python2_7(-),python_targets_python3_3(-)?,-python_single_target_python3_3(-),python_targets_pypy1_9(-)?,-python_single_target_pypy1_9(-),python_targets_pypy2_0(-)?,-python_single_target_pypy2_0(-)] >=dev-python/pygments-1.2[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] dev-python/setuptools[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)] latex? ( dev-texlive/texlive-latexextra app-text/dvipng ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_python3_3? ( dev-lang/python:3.3 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_python3_3(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_python3_3 python_targets_pypy1_9 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/S/Sphinx/Sphinx-1.1.3.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=4052aa97800955aad3a29077c39ec434
diff --git a/metadata/md5-cache/dev-python/xlrd-0.9.2 b/metadata/md5-cache/dev-python/xlrd-0.9.2
new file mode 100644
index 000000000000..28881476cf9d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/xlrd-0.9.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+DESCRIPTION=Library for developers to extract data from Microsoft Excel (tm) spreadsheet files
+EAPI=5
+HOMEPAGE=http://pypi.python.org/pypi/xlrd
+IUSE=doc examples python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0
+KEYWORDS=~amd64 ~x86 ~ppc-aix ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~x86-linux ~sparc-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) python_targets_python3_1? ( dev-lang/python:3.1 ) python_targets_python3_2? ( dev-lang/python:3.2 ) python_targets_pypy1_9? ( dev-python/pypy:1.9 ) python_targets_pypy2_0? ( dev-python/pypy:2.0 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_targets_python3_1(-)?,python_targets_python3_2(-)?,python_targets_pypy1_9(-)?,python_targets_pypy2_0(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-),-python_single_target_python3_1(-),-python_single_target_python3_2(-),-python_single_target_pypy1_9(-),-python_single_target_pypy2_0(-)]
+REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_targets_python3_1 python_targets_python3_2 python_targets_pypy1_9 python_targets_pypy2_0 )
+SLOT=0
+SRC_URI=mirror://pypi/x/xlrd/xlrd-0.9.2.tar.gz
+_eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=5cd82170e24805f03793364c513972d3
diff --git a/metadata/md5-cache/dev-ruby/amq-client-1.0.2 b/metadata/md5-cache/dev-ruby/amq-client-1.0.2
new file mode 100644
index 000000000000..7ce316bc5248
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/amq-client-1.0.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby18? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby18] dev-ruby/eventmachine[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby19] dev-ruby/eventmachine[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ree18] dev-ruby/eventmachine[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/evented-spec[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/evented-spec[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
+DESCRIPTION=A fully-featured, low-level AMQP 0.9.1 client.
+EAPI=5
+HOMEPAGE=http://github.com/ruby-amqp/amq-client
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby18] dev-ruby/eventmachine[ruby_targets_ruby18] ) ruby_targets_ruby19? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ruby19] dev-ruby/eventmachine[ruby_targets_ruby19] ) ruby_targets_ree18? ( >=dev-ruby/amq-protocol-1.2.0[ruby_targets_ree18] dev-ruby/eventmachine[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_ree18 )
+SLOT=0
+SRC_URI=mirror://rubygems/amq-client-1.0.2.gem
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=f66b213b8476e4bc9240d1def05527f7
diff --git a/metadata/md5-cache/dev-ruby/amq-protocol-1.6.0 b/metadata/md5-cache/dev-ruby/amq-protocol-1.6.0
new file mode 100644
index 000000000000..a27993807270
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/amq-protocol-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rspec:2[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
+DESCRIPTION=An AMQP 0.9.1 serialization library for Ruby.
+EAPI=5
+HOMEPAGE=http://github.com/ruby-amqp/amq-protocol
+IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby test test
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
+REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
+SLOT=0
+SRC_URI=mirror://rubygems/amq-protocol-1.6.0.gem
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=9f23957f0429d806188f5c982df6fb9c
diff --git a/metadata/md5-cache/dev-ruby/amqp-0.9.7 b/metadata/md5-cache/dev-ruby/amqp-0.9.7
deleted file mode 100644
index b4412fca2c69..000000000000
--- a/metadata/md5-cache/dev-ruby/amqp-0.9.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( test? ( dev-ruby/multi_json[ruby_targets_ruby18] dev-ruby/evented-spec[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/multi_json[ruby_targets_ree18] dev-ruby/evented-spec[ruby_targets_ree18] ) ) test? ( ruby_targets_ruby18? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby18] >=dev-ruby/amq-client-0.9.4[ruby_targets_ruby18] >=dev-ruby/amq-protocol-0.9.4[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ree18] >=dev-ruby/amq-client-0.9.4[ruby_targets_ree18] >=dev-ruby/amq-protocol-0.9.4[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( test? ( dev-ruby/rspec:2[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rspec:2[ruby_targets_ree18] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) )
-DESCRIPTION=AMQP client implementation in Ruby/EventMachine
-EAPI=4
-HOMEPAGE=http://amqp.rubyforge.org/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=Ruby
-RDEPEND=ruby_targets_ruby18? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ruby18] >=dev-ruby/amq-client-0.9.4[ruby_targets_ruby18] >=dev-ruby/amq-protocol-0.9.4[ruby_targets_ruby18] ) ruby_targets_ree18? ( >=dev-ruby/eventmachine-0.12.4[ruby_targets_ree18] >=dev-ruby/amq-client-0.9.4[ruby_targets_ree18] >=dev-ruby/amq-protocol-0.9.4[ruby_targets_ree18] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 )
-SLOT=0.9
-SRC_URI=mirror://rubygems/amqp-0.9.7.gem
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=10b42dbf133951c637e68706b5088cfe
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.10.5 b/metadata/md5-cache/dev-ruby/mocha-0.10.5
index d4d22bc4dc63..9d0012ef18b5 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.10.5
+++ b/metadata/md5-cache/dev-ruby/mocha-0.10.5
@@ -8,7 +8,7 @@ KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
+SLOT=0.10
 SRC_URI=mirror://rubygems/mocha-0.10.5.gem
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=9bb7335d840f486fad1d1a146d12cdd1
+_md5_=29c83fbe1ab7a3b95d238f7a6635b8b4
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.11.4 b/metadata/md5-cache/dev-ruby/mocha-0.11.4
index 6b501ef637b9..a2530ad26420 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.11.4
+++ b/metadata/md5-cache/dev-ruby/mocha-0.11.4
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x8
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
+SLOT=0.11
 SRC_URI=mirror://rubygems/mocha-0.11.4.gem
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=437550f0e7943e9742f52fa86ed968e6
+_md5_=108573200fb9cea74e8aaeb881d120a4
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.12.7 b/metadata/md5-cache/dev-ruby/mocha-0.12.7
index 2a06e14f641b..9e917c11b80f 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.12.7
+++ b/metadata/md5-cache/dev-ruby/mocha-0.12.7
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x8
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
+SLOT=0.12
 SRC_URI=mirror://rubygems/mocha-0.12.7.gem
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=30d546fb0b26bea7ab677b2a28c4db54
+_md5_=e5102143658a6f76b6d7b0e1d131fa43
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.0 b/metadata/md5-cache/dev-ruby/mocha-0.13.0
deleted file mode 100644
index dbed0baf5f4e..000000000000
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock
-EAPI=4
-HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/mocha-0.13.0.gem
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=eed4ec6a3807090c110a0f3ecfe48029
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.1 b/metadata/md5-cache/dev-ruby/mocha-0.13.1
deleted file mode 100644
index c179969b45e2..000000000000
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby18? ( doc? ( dev-ruby/yard[ruby_targets_ruby18] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/yard[ruby_targets_ree18] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/yard[ruby_targets_ruby19] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/yard[ruby_targets_jruby] ) test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_jruby] ) ) test? ( ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( doc? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( doc? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( doc? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( doc? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( test? ( dev-ruby/rake[ruby_targets_ruby18] ) ) ruby_targets_ree18? ( test? ( dev-ruby/rake[ruby_targets_ree18] ) ) ruby_targets_ruby19? ( test? ( dev-ruby/rake[ruby_targets_ruby19] ) ) ruby_targets_jruby? ( test? ( dev-ruby/rake[ruby_targets_jruby] ) ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) test? ( ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] ) )
-DESCRIPTION=A Ruby library for mocking and stubbing using a syntax like that of JMock, and SchMock
-EAPI=5
-HOMEPAGE=http://gofreerange.com/mocha/docs/
-IUSE=test elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby doc test test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ree18? ( dev-ruby/metaclass[ruby_targets_ree18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ree18? ( dev-lang/ruby-enterprise:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ree18? ( virtual/rubygems[ruby_targets_ree18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
-REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ree18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
-SRC_URI=mirror://rubygems/mocha-0.13.1.gem
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f14c49e300cedd426df70d185d1a33fb
diff --git a/metadata/md5-cache/dev-ruby/mocha-0.13.3 b/metadata/md5-cache/dev-ruby/mocha-0.13.3
index 5de6793f9c92..d0b4b8553270 100644
--- a/metadata/md5-cache/dev-ruby/mocha-0.13.3
+++ b/metadata/md5-cache/dev-ruby/mocha-0.13.3
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x8
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-ruby/metaclass[ruby_targets_ruby18] ) ruby_targets_ruby19? ( dev-ruby/metaclass[ruby_targets_ruby19] ) ruby_targets_jruby? ( dev-ruby/metaclass[ruby_targets_jruby] ) ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_jruby? ( dev-java/jruby ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_jruby? ( virtual/rubygems[ruby_targets_jruby] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 ruby_targets_jruby )
-SLOT=0
+SLOT=0.13
 SRC_URI=mirror://rubygems/mocha-0.13.3.gem
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=f1c33d15ff4e2d4b2a1ecce497f16ba7
+_md5_=938b25f560a0a76f53584ac1cd360c80
diff --git a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2 b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2
index 13c5bea662e6..9f4cd3ffaebc 100644
--- a/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2
+++ b/metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2
@@ -4,11 +4,11 @@ DESCRIPTION=Provides transaction support at the object level
 EAPI=4
 HOMEPAGE=http://rubyforge.org/projects/trans-simple/
 IUSE=elibc_FreeBSD ruby_targets_ruby18 ruby_targets_ruby19 doc test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=MIT
 RDEPEND=ruby_targets_ruby18? ( dev-lang/ruby:1.8 ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby18? ( virtual/rubygems[ruby_targets_ruby18] ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] )
 REQUIRED_USE=|| ( ruby_targets_ruby18 ruby_targets_ruby19 )
 SLOT=0
 SRC_URI=mirror://rubygems/transaction-simple-1.4.0.2.gem
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	ruby-fakegem	d2a1d4e0903b29b09c892b21b79fcf46	ruby-ng	10ca07a887e226622062d89bb959a175	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=b105e1ef2664429ae7bf217a27f1a6fc
+_md5_=3e937c4064b5b7709317e0186b8f6bfe
diff --git a/metadata/md5-cache/dev-util/debootstrap-1.0.52 b/metadata/md5-cache/dev-util/debootstrap-1.0.52
new file mode 100644
index 000000000000..02cb6780ceb5
--- /dev/null
+++ b/metadata/md5-cache/dev-util/debootstrap-1.0.52
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst unpack
+DESCRIPTION=Debian/Ubuntu bootstrap scripts
+EAPI=5
+HOMEPAGE=http://packages.qa.debian.org/d/debootstrap.html
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sh ~sparc ~x86
+LICENSE=MIT
+RDEPEND=app-arch/dpkg net-misc/wget sys-devel/binutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/d/debootstrap/debootstrap_1.0.52.tar.gz mirror://gentoo/devices.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=fac6008d5eeec82c8f625e3889e22d08
diff --git a/metadata/md5-cache/dev-util/eric-4.5.10 b/metadata/md5-cache/dev-util/eric-4.5.10
index b9abb7b019d5..66379d47389b 100644
--- a/metadata/md5-cache/dev-util/eric-4.5.10
+++ b/metadata/md5-cache/dev-util/eric-4.5.10
@@ -4,11 +4,11 @@ DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
 EAPI=4
 HOMEPAGE=http://eric-ide.python-projects.org/
 IUSE=kde spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 PDEPEND=spell? ( dev-python/pyenchant )
 RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.9.6-r1[X,help,svg,webkit] >=dev-python/qscintilla-python-2.3 kde? ( kde-base/pykde4 ) >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.0.1 >=dev-python/pygments-1.3.1 || ( =dev-lang/python-2.7* =dev-lang/python-2.6* )
 SLOT=4
 SRC_URI=mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-4.5.10.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-cs-4.5.10.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-de-4.5.10.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-en-4.5.10.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-es-4.5.10.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-fr-4.5.10.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-it-4.5.10.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-ru-4.5.10.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-tr-4.5.10.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric4/stable/4.5.10/eric4-i18n-zh_CN.GB2312-4.5.10.tar.gz )
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=799bfd4339e0edc78aea0df18d2c068b
+_md5_=df79a50473d2b5513b37daa909d7d993
diff --git a/metadata/md5-cache/dev-util/eric-5.3.2 b/metadata/md5-cache/dev-util/eric-5.3.2
index 030c091c1b16..80466d899c96 100644
--- a/metadata/md5-cache/dev-util/eric-5.3.2
+++ b/metadata/md5-cache/dev-util/eric-5.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=A full featured Python IDE using PyQt4 and QScintilla
 EAPI=4
 HOMEPAGE=http://eric-ide.python-projects.org/
 IUSE=spell linguas_cs linguas_de linguas_en linguas_es linguas_fr linguas_it linguas_ru linguas_tr linguas_zh_CN
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86
 LICENSE=GPL-3
 PDEPEND=spell? ( dev-python/pyenchant )
 RDEPEND=>=dev-python/sip-4.12.4 >=dev-python/PyQt4-4.9.6-r1[X,help,sql,svg,webkit] >=dev-python/qscintilla-python-2.6 >=dev-python/chardet-2.0.1 >=dev-python/coverage-3.2 >=dev-python/pygments-1.5 || ( =dev-lang/python-3.3* =dev-lang/python-3.2* =dev-lang/python-3.1* )
 SLOT=5
 SRC_URI=mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-5.3.2.tar.gz linguas_cs? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-cs-5.3.2.tar.gz ) linguas_de? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-de-5.3.2.tar.gz ) linguas_en? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-en-5.3.2.tar.gz ) linguas_es? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-es-5.3.2.tar.gz ) linguas_fr? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-fr-5.3.2.tar.gz ) linguas_it? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-it-5.3.2.tar.gz ) linguas_ru? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-ru-5.3.2.tar.gz ) linguas_tr? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-tr-5.3.2.tar.gz ) linguas_zh_CN? ( mirror://sourceforge/eric-ide/eric5/stable/5.3.2/eric5-i18n-zh_CN.GB2312-5.3.2.tar.gz )
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=a6aadd5948ac27f9b840aeab408dab20
+_md5_=ae13c5cc0bbdf47d621311fb578ad2c3
diff --git a/metadata/md5-cache/dev-vcs/bzr-explorer-1.2.1 b/metadata/md5-cache/dev-vcs/bzr-explorer-1.2.1
deleted file mode 100644
index de313fae932e..000000000000
--- a/metadata/md5-cache/dev-vcs/bzr-explorer-1.2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A high level interface to all commonly used Bazaar features
-EAPI=3
-HOMEPAGE=https://launchpad.net/bzr-explorer
-IUSE=gtk
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/bzr-1.14 >=dev-vcs/qbzr-0.21 gtk? ( dev-vcs/bzr-gtk ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://launchpad.net/bzr-explorer/1.2/1.2.1/+download/bzr-explorer-1.2.1.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=4289724d3e80c35f61eee5488a954399
diff --git a/metadata/md5-cache/dev-vcs/bzr-explorer-1.2.2 b/metadata/md5-cache/dev-vcs/bzr-explorer-1.2.2
deleted file mode 100644
index 4e1dbab9940d..000000000000
--- a/metadata/md5-cache/dev-vcs/bzr-explorer-1.2.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare
-DEPEND==dev-lang/python-2*
-DESCRIPTION=A high level interface to all commonly used Bazaar features
-EAPI=3
-HOMEPAGE=https://launchpad.net/bzr-explorer
-IUSE=gtk
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=dev-vcs/bzr-2.3 >=dev-vcs/qbzr-0.22 gtk? ( dev-vcs/bzr-gtk ) =dev-lang/python-2*
-SLOT=0
-SRC_URI=http://launchpad.net/bzr-explorer/1.2/1.2.2/+download/bzr-explorer-1.2.2.tar.gz
-_eclasses_=distutils	77fc6005d2dfcc7bdb5ec363a49d9912	multilib	892e597faee02a5b94eb02ab512e7622	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=07ff6361ac1a9c76fbf4e78655e3ff85
diff --git a/metadata/md5-cache/dev-vcs/tortoisehg-2.8 b/metadata/md5-cache/dev-vcs/tortoisehg-2.8
index 0c4cf7037a06..bc275903a0d5 100644
--- a/metadata/md5-cache/dev-vcs/tortoisehg-2.8
+++ b/metadata/md5-cache/dev-vcs/tortoisehg-2.8
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=dev-vcs/mercurial-2.5 =dev-python/sphinx-1.0.3 ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+DEPEND=>=dev-vcs/mercurial-2.5 =dev-python/sphinx-1.0.3 ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 DESCRIPTION=Set of graphical tools for Mercurial
 EAPI=5
 HOMEPAGE=http://tortoisehg.bitbucket.org
 IUSE=doc python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=dev-vcs/mercurial-2.5 =dev-vcs/mercurial-2.5 =dev-python/sphinx-1.0.3 ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/mercurial
+DEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/PyQt4[svg,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/qscintilla-python[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] doc? ( >=dev-python/sphinx-1.0.3 ) python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-vcs/mercurial
 DESCRIPTION=Set of graphical tools for Mercurial
 EAPI=5
 HOMEPAGE=http://tortoisehg.bitbucket.org
 IUSE=doc python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
 LICENSE=GPL-2
-RDEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/PyQt4[svg,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/qscintilla-python python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
+RDEPEND=dev-vcs/mercurial dev-python/iniparse[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/pygments[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/PyQt4[svg,python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] dev-python/qscintilla-python[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)] python_targets_python2_5? ( dev-lang/python:2.5 ) python_targets_python2_6? ( dev-lang/python:2.6 ) python_targets_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,-python_single_target_python2_5(-),-python_single_target_python2_6(-),-python_single_target_python2_7(-)]
 REQUIRED_USE=|| ( python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 )
 SLOT=0
 _eclasses_=distutils-r1	6950481ecc2ad548f2d9d116a0936fb8	eutils	f31a0ec0d081047cbf9c0bbb4822d831	mercurial	5fcb2f60868c283ece4cadfce78a5b24	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=df903f1057836c928dd3939381390b04
+_md5_=8e15e9dab40d471041d112beb5fb43ea
diff --git a/metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1 b/metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1
index badf82625e66..b581f5bbd583 100644
--- a/metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1
+++ b/metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=CC-BY-NC-ND-3.0
 RDEPEND=system-renpy? ( games-engines/renpy )
 SLOT=0
-SRC_URI=http://naodesu.org/files/katawa-shoujo/katawa-shoujo-1.0.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png
+SRC_URI=http://dl.katawa-shoujo.com/gold/%5b4ls%5d_katawa_shoujo_%5blinux-x86%5d%5bEA1DFB30%5d.tar.bz2 -> katawa-shoujo-1.0.tar.bz2 http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-48.png http://dev.gentoo.org/~hasufell/distfiles/katawa-shoujo-256.png
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	games	0fb7637597e0869f6c8be79b11d0135a	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=2922741d96c2238430d010654865ed59
+_md5_=6c61573ca333c164a070c315b1679f92
diff --git a/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20130522 b/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20130522
new file mode 100644
index 000000000000..6186d4072564
--- /dev/null
+++ b/metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20130522
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] =dev-libs/libgit2-0.17* >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Git commit integration in Akonadi
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/playground/pim/akonadi-git-resource
+IUSE=debug aqua
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=http://dev.gentoo.org/~johu/distfiles/akonadi-git-resource-0_p20130522.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=5f07cd56e10a4d81a85da771282b0ce7
diff --git a/metadata/md5-cache/mail-client/clawsker-0.7.10 b/metadata/md5-cache/mail-client/clawsker-0.7.10
new file mode 100644
index 000000000000..5efe3f7e849c
--- /dev/null
+++ b/metadata/md5-cache/mail-client/clawsker-0.7.10
@@ -0,0 +1,9 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Applet to edit Claws Mail's hidden preferences.
+HOMEPAGE=http://www.claws-mail.org/clawsker/
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=dev-lang/perl-5.8.0 >=dev-perl/gtk2-perl-1.200 >=dev-perl/Locale-gettext-1.05 >=mail-client/claws-mail-3.5.0
+SLOT=0
+SRC_URI=http://www.claws-mail.org/tools/clawsker-0.7.10.tar.gz
+_md5_=1200ae3fd617c6bf564f386e58df4a84
diff --git a/metadata/md5-cache/mail-client/sylpheed-3.2.0 b/metadata/md5-cache/mail-client/sylpheed-3.2.0
deleted file mode 100644
index 4e68cef14539..000000000000
--- a/metadata/md5-cache/mail-client/sylpheed-3.2.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=x11-libs/gtk+:2 nls? ( sys-devel/gettext ) crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) oniguruma? ( dev-libs/oniguruma ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl ) virtual/pkgconfig xface? ( media-libs/compface )
-DESCRIPTION=A lightweight email client and newsreader
-EAPI=4
-HOMEPAGE=http://sylpheed.sraoss.jp/
-IUSE=crypt ipv6 ldap nls oniguruma pda spell ssl xface
-KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86 ~x86-fbsd
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=x11-libs/gtk+:2 nls? ( sys-devel/gettext ) crypt? ( app-crypt/gpgme ) ldap? ( net-nds/openldap ) oniguruma? ( dev-libs/oniguruma ) pda? ( app-pda/jpilot ) spell? ( app-text/gtkspell:2 ) ssl? ( dev-libs/openssl ) app-misc/mime-types net-misc/curl
-SLOT=0
-SRC_URI=http://sylpheed.sraoss.jp/sylpheed/v3.2/sylpheed-3.2.0.tar.bz2
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=30f8fda40b2c94145881dda250cc8ac1
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre040 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre040
deleted file mode 100644
index a0f062a74ae6..000000000000
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre040
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=ipafont? ( media-gfx/fontforge >=media-fonts/ja-ipafonts-003.02 ) X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=M+ Japanese outline fonts with IPA font
-EAPI=2
-HOMEPAGE=http://mplus-fonts.sourceforge.jp/ https://sourceforge.jp/projects/opfc/
-IUSE=ipafont X
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos
-LICENSE=mplus-fonts IPAfont
-RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-040.tar.gz
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	font	496e78852e1e48010965fdd33a505f9c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=dee5ac91d79a03d8c07eb5cd4e648191
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043
deleted file mode 100644
index f331f326b289..000000000000
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=ipafont? ( media-gfx/fontforge >=media-fonts/ja-ipafonts-003.02 ) X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=M+ Japanese outline fonts with IPA font
-EAPI=3
-HOMEPAGE=http://mplus-fonts.sourceforge.jp/ https://sourceforge.jp/projects/opfc/
-IUSE=ipafont X
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos
-LICENSE=mplus-fonts IPAfont
-RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-043.tar.gz
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	font	496e78852e1e48010965fdd33a505f9c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=87db51dedad84168baa8e2279f1fbe9f
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043-r1 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043-r1
deleted file mode 100644
index c711bee624a8..000000000000
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare setup
-DEPEND=ipafont? ( media-gfx/fontforge >=media-fonts/ja-ipafonts-003.02 ) X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-DESCRIPTION=M+ Japanese outline fonts
-EAPI=3
-HOMEPAGE=http://mplus-fonts.sourceforge.jp/ http://ossipedia.ipa.go.jp/ipafont/
-IUSE=ipafont X
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos
-LICENSE=mplus-fonts ipafont? ( IPAfont )
-RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
-RESTRICT=strip binchecks
-SLOT=0
-SRC_URI=mirror://sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-043.tar.gz
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	font	496e78852e1e48010965fdd33a505f9c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=8a94da1800bf1b8b7ad8f614125f9b30
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre052 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre052
index 3d70929302b5..18ca4c44e25e 100644
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre052
+++ b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre052
@@ -4,11 +4,11 @@ DESCRIPTION=M+ Japanese outline fonts
 EAPI=3
 HOMEPAGE=http://mplus-fonts.sourceforge.jp/ http://ossipedia.ipa.go.jp/ipafont/
 IUSE=ipafont X
-KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos
+KEYWORDS=amd64 ~hppa ia64 ~ppc x86 ~ppc-macos ~x86-macos
 LICENSE=mplus-fonts ipafont? ( IPAfont )
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
 RESTRICT=strip binchecks
 SLOT=0
 SRC_URI=mirror://sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-052.tar.xz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	font	496e78852e1e48010965fdd33a505f9c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=9c87cc7a6300aa4213ac661b31388f1f
+_md5_=7c19398da093f8e8c6ffd2ad4737ed58
diff --git a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre046 b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre055
similarity index 93%
rename from metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre046
rename to metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre055
index 32f4e89a0d71..2f61b262f8d0 100644
--- a/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre046
+++ b/metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre055
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile install postinst postrm prepare setup
 DEPEND=ipafont? ( media-gfx/fontforge >=media-fonts/ja-ipafonts-003.02 ) X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
 DESCRIPTION=M+ Japanese outline fonts
-EAPI=3
+EAPI=4
 HOMEPAGE=http://mplus-fonts.sourceforge.jp/ http://ossipedia.ipa.go.jp/ipafont/
 IUSE=ipafont X
 KEYWORDS=~amd64 ~hppa ~ia64 ~ppc ~x86 ~ppc-macos ~x86-macos
@@ -9,6 +9,6 @@ LICENSE=mplus-fonts ipafont? ( IPAfont )
 RDEPEND=X? ( x11-apps/mkfontdir media-fonts/encodings ) >=media-libs/fontconfig-2.4.0
 RESTRICT=strip binchecks
 SLOT=0
-SRC_URI=mirror://sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-046.tar.xz
+SRC_URI=mirror://sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-055.tar.xz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	font	496e78852e1e48010965fdd33a505f9c	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=14b055533a2d555e96c1bf270ed04381
+_md5_=197ad946b6e5e3bb3af45841d6f8d00c
diff --git a/metadata/md5-cache/media-gfx/ufraw-0.19.2 b/metadata/md5-cache/media-gfx/ufraw-0.19.2
index 1dcbbd3c87ab..8d862f9817d0 100644
--- a/metadata/md5-cache/media-gfx/ufraw-0.19.2
+++ b/metadata/md5-cache/media-gfx/ufraw-0.19.2
@@ -1,4 +1,4 @@
-DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
 DEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=media-libs/lensfun-0.2.5 media-libs/tiff fits? ( sci-libs/cfitsio ) gnome? ( >=gnome-base/gconf-2 ) gtk? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 ) gimp? ( >=x11-libs/gtk+-2.6:2 >=media-gfx/gtkimageview-1.5 >=media-gfx/gimp-2 ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
 DESCRIPTION=RAW Image format viewer and GIMP plugin
 EAPI=5
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/glib:2 >=media-gfx/exiv2-0.11 virtual/jpeg media-libs/lcms:0 >=
 SLOT=0
 SRC_URI=mirror://sourceforge/ufraw/ufraw-0.19.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=17b6edc401db86d70d43ad5f0f1037d0
+_md5_=ffe5916ee49845b36cb1c28eab8f26e0
diff --git a/metadata/md5-cache/media-libs/libcdr-0.0.14 b/metadata/md5-cache/media-libs/libcdr-0.0.14
index 9c2fb1404ec4..ac2fa519aab8 100644
--- a/metadata/md5-cache/media-libs/libcdr-0.0.14
+++ b/metadata/md5-cache/media-libs/libcdr-0.0.14
@@ -10,4 +10,4 @@ RDEPEND=app-text/libwpd:0.9 app-text/libwpg:0.2 dev-libs/icu:= media-libs/lcms:2
 SLOT=0
 SRC_URI=http://dev-www.libreoffice.org/src/libcdr-0.0.14.tar.xz
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=37de59626863480e734b4aca5bc2da6d
+_md5_=9e46ed3f08a0b207ab0ff7ce64d2a61b
diff --git a/metadata/md5-cache/media-libs/mesa-9.1.2-r1 b/metadata/md5-cache/media-libs/mesa-9.1.2-r1
index 42843686130f..ebd63e7f0423 100644
--- a/metadata/md5-cache/media-libs/mesa-9.1.2-r1
+++ b/metadata/md5-cache/media-libs/mesa-9.1.2-r1
@@ -4,11 +4,11 @@ DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=5
 HOMEPAGE=http://mesa3d.sourceforge.net/
 IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_nouveau video_cards_vmware bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau wayland xvmc xa xorg kernel_FreeBSD python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT SGI-B-2.0
 RDEPEND=!=app-admin/eselect-opengl-1.2.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:=[-minimal] x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] )
 REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
 SLOT=0
 SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.1.2/MesaLib-9.1.2.tar.bz2 mirror://gentoo/mesa-9.1-gentoo-patches-05.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=70b3703c7cedd96e83782d32a8a69b0a
+_md5_=7750a58386354c9ca821714b02de9049
diff --git a/metadata/md5-cache/media-libs/mesa-9.1.3 b/metadata/md5-cache/media-libs/mesa-9.1.3
new file mode 100644
index 000000000000..6821aab9b0f7
--- /dev/null
+++ b/metadata/md5-cache/media-libs/mesa-9.1.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare setup unpack
+DEPEND=!=app-admin/eselect-opengl-1.2.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:=[-minimal] x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) llvm? ( >=sys-devel/llvm-2.9 r600-llvm-compiler? ( sys-devel/llvm[video_cards_radeon] ) video_cards_radeonsi? ( sys-devel/llvm[video_cards_radeon] ) ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] dev-libs/libxml2[python,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] sys-devel/bison sys-devel/flex virtual/pkgconfig >=x11-proto/dri2proto-2.6 >=x11-proto/glproto-1.4.15-r1 >=x11-proto/xextproto-7.0.99.1 x11-proto/xf86driproto x11-proto/xf86vidmodeproto || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=OpenGL-like graphic library for Linux
+EAPI=5
+HOMEPAGE=http://mesa3d.sourceforge.net/
+IUSE=video_cards_i915 video_cards_i965 video_cards_intel video_cards_r100 video_cards_r200 video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_nouveau video_cards_vmware bindist +classic debug +egl +gallium gbm gles1 gles2 +llvm +nptl openvg osmesa pax_kernel pic r600-llvm-compiler selinux +shared-glapi vdpau wayland xvmc xa xorg kernel_FreeBSD python_targets_python2_6 python_targets_python2_7 python_single_target_python2_6 python_single_target_python2_7
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT SGI-B-2.0
+RDEPEND=!=app-admin/eselect-opengl-1.2.7 dev-libs/expat gbm? ( virtual/udev ) >=x11-libs/libX11-1.3.99.901 x11-libs/libXdamage x11-libs/libXext x11-libs/libXxf86vm >=x11-libs/libxcb-1.8.1 vdpau? ( >=x11-libs/libvdpau-0.4.1 ) wayland? ( >=dev-libs/wayland-1.0.3 ) xorg? ( x11-base/xorg-server:=[-minimal] x11-libs/libdrm[libkms] ) xvmc? ( >=x11-libs/libXvMC-1.0.6 ) >=x11-libs/libdrm-2.4.42[video_cards_nouveau?,video_cards_vmware?] video_cards_i915? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_i965? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_intel? ( >=x11-libs/libdrm-2.4.42[video_cards_intel] ) video_cards_r100? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r200? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.42[video_cards_radeon] )
+REQUIRED_USE=llvm? ( gallium ) openvg? ( egl gallium ) gbm? ( shared-glapi ) gles1? ( egl ) gles2? ( egl ) r600-llvm-compiler? ( gallium llvm || ( video_cards_r600 video_cards_radeon ) ) xa? ( gallium ) xorg? ( gallium ) video_cards_intel? ( || ( classic gallium ) ) video_cards_i915? ( || ( classic gallium ) ) video_cards_i965? ( classic ) video_cards_nouveau? ( || ( classic gallium ) ) video_cards_radeon? ( || ( classic gallium ) ) video_cards_r100? ( classic ) video_cards_r200? ( classic ) video_cards_r300? ( gallium ) video_cards_r600? ( gallium ) video_cards_radeonsi? ( gallium llvm ) video_cards_vmware? ( gallium )
+SLOT=0
+SRC_URI=ftp://ftp.freedesktop.org/pub/mesa/9.1.3/MesaLib-9.1.3.tar.bz2 mirror://gentoo/mesa-9.1-gentoo-patches-05.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	base	ec46b36a6f6fd1d0b505a33e0b74e413	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3b49d97a2ec631be9b47938e127761e4
diff --git a/metadata/md5-cache/media-sound/mpg123-1.15.4 b/metadata/md5-cache/media-sound/mpg123-1.15.4
new file mode 100644
index 000000000000..dd0c6d871b3e
--- /dev/null
+++ b/metadata/md5-cache/media-sound/mpg123-1.15.4
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install postinst postrm prepare
+DEPEND=app-admin/eselect-mpg123 >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl ) virtual/pkgconfig
+DESCRIPTION=a realtime MPEG 1.0/2.0/2.5 audio player for layers 1, 2 and 3
+EAPI=5
+HOMEPAGE=http://www.mpg123.org/
+IUSE=3dnow 3dnowext alsa altivec coreaudio int-quality ipv6 jack mmx nas oss portaudio pulseaudio sdl sse
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2 LGPL-2.1
+RDEPEND=app-admin/eselect-mpg123 >=sys-devel/libtool-2.2.6b alsa? ( media-libs/alsa-lib ) jack? ( media-sound/jack-audio-connection-kit ) nas? ( media-libs/nas ) portaudio? ( media-libs/portaudio ) pulseaudio? ( media-sound/pulseaudio ) sdl? ( media-libs/libsdl )
+SLOT=0
+SRC_URI=http://www.mpg123.org/download/mpg123-1.15.4.tar.bz2
+_eclasses_=libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
+_md5_=ea0f621d9e19c7f31b6f136d56d35f17
diff --git a/metadata/md5-cache/media-sound/ncmpc-0.21 b/metadata/md5-cache/media-sound/ncmpc-0.21
index 6f18078cffb5..9f418be8fb41 100644
--- a/metadata/md5-cache/media-sound/ncmpc-0.21
+++ b/metadata/md5-cache/media-sound/ncmpc-0.21
@@ -4,10 +4,10 @@ DESCRIPTION=A ncurses client for the Music Player Daemon (MPD)
 EAPI=4
 HOMEPAGE=http://mpd.wikia.com/wiki/Client:Ncmpc
 IUSE=artist-screen chat-screen colors debug +help-screen key-screen lirc lyrics-screen mouse nls search-screen song-screen
-KEYWORDS=~amd64 hppa ~ppc ~ppc64 ~sparc ~x86
+KEYWORDS=amd64 hppa ~ppc ~ppc64 ~sparc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.12:2 >=media-libs/libmpdclient-2.2 sys-libs/ncurses lirc? ( app-misc/lirc ) nls? ( sys-libs/ncurses[unicode] )
 SLOT=0
 SRC_URI=http://www.musicpd.org/download/ncmpc/0/ncmpc-0.21.tar.bz2
 _eclasses_=multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f
-_md5_=1b6ce4ada9d35c7fd90aa050b05e10a7
+_md5_=eab0b7cc520c12e00f4cccc2b3f22243
diff --git a/metadata/md5-cache/media-video/ffmpeg-9999 b/metadata/md5-cache/media-video/ffmpeg-9999
index b92c03ce9932..34c32e1fde99 100644
--- a/metadata/md5-cache/media-video/ffmpeg-9999
+++ b/metadata/md5-cache/media-video/ffmpeg-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
+DEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( media-libs/libquvi ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc >=sys-devel/make-3.81 doc? ( app-text/texi2html ) fontconfig? ( virtual/pkgconfig ) gnutls? ( virtual/pkgconfig ) ieee1394? ( virtual/pkgconfig ) libv4l? ( virtual/pkgconfig ) mmx? ( dev-lang/yasm ) rtmp? ( virtual/pkgconfig ) schroedinger? ( virtual/pkgconfig ) test? ( net-misc/wget ) truetype? ( virtual/pkgconfig ) v4l? ( sys-kernel/linux-headers ) dev-vcs/git
 DESCRIPTION=Complete solution to record, convert and stream audio and video. Includes libavcodec.
 EAPI=4
 HOMEPAGE=http://ffmpeg.org/
-IUSE=aac aacplus alsa amr bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio rtmp schroedinger sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
+IUSE=aac aacplus alsa amr bindist bluray +bzip2 cdio celt cpudetection debug doc +encode examples faac fdk flite fontconfig frei0r gnutls gsm +hardcoded-tables +iconv iec61883 ieee1394 jack jpeg2k libass libcaca libsoxr libv4l modplug mp3 network openal openssl opus oss pic pulseaudio quvi rtmp schroedinger sdl speex static-libs test theora threads truetype twolame v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext ssse3 vis neon +fftools_aviocat +fftools_cws2fws +fftools_ffescape +fftools_ffeval +fftools_fourcc2pixfmt +fftools_graph2dot +fftools_ismindex +fftools_pktdumper +fftools_qt-faststart +fftools_trasher
 LICENSE=GPL-2 amr? ( GPL-3 ) encode? ( aac? ( GPL-3 ) )
-RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
+RDEPEND=alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bluray? ( media-libs/libbluray ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-libs/celt-0.11.1 ) encode? ( aac? ( media-libs/vo-aacenc ) aacplus? ( media-libs/libaacplus ) amr? ( media-libs/vo-amrwbenc ) faac? ( media-libs/faac ) fdk? ( media-libs/fdk-aac ) mp3? ( >=media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) twolame? ( media-sound/twolame ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) flite? ( app-accessibility/flite ) fontconfig? ( media-libs/fontconfig ) frei0r? ( media-plugins/frei0r-plugins ) gnutls? ( >=net-libs/gnutls-2.12.16 ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) iconv? ( virtual/libiconv ) iec61883? ( media-libs/libiec61883 sys-libs/libraw1394 sys-libs/libavc1394 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) libass? ( media-libs/libass ) libcaca? ( media-libs/libcaca ) libsoxr? ( media-libs/soxr ) libv4l? ( media-libs/libv4l ) modplug? ( media-libs/libmodplug ) openal? ( >=media-libs/openal-1.1 ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) quvi? ( media-libs/libquvi ) rtmp? ( >=media-video/rtmpdump-2.2f ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) truetype? ( media-libs/freetype:2 ) vaapi? ( >=x11-libs/libva-0.32 ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libvorbis media-libs/libogg ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib ) !media-video/qt-faststart !media-libs/libpostproc
 REQUIRED_USE=bindist? ( encode? ( !faac !aacplus ) !openssl ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( encode )
 SLOT=0
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	git-2	e92e09651292b1bef5656592364550f7	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=c9169cfa8313d0db4b42700f9cfc726b
+_md5_=6ce32eb20200997e82464fb83ebba071
diff --git a/metadata/md5-cache/media-video/handbrake-0.9.9 b/metadata/md5-cache/media-video/handbrake-0.9.9
new file mode 100644
index 000000000000..a8cbd86defd4
--- /dev/null
+++ b/metadata/md5-cache/media-video/handbrake-0.9.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=media-libs/a52dec media-libs/libass media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread media-libs/libmpeg2 media-libs/libmp4v2:0 media-libs/libmkv media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/x264 media-sound/lame ffmpeg? ( =virtual/ffmpeg-9 ) sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 ) ) gtk? ( x11-libs/gtk+:3 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango >=virtual/udev-171[gudev] ) fdk? ( media-libs/fdk-aac ) || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) dev-lang/yasm sys-devel/automake || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4
+DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
+EAPI=5
+HOMEPAGE=http://handbrake.fr/
+IUSE=fdk ffmpeg gstreamer gtk
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=media-libs/a52dec media-libs/libass media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread media-libs/libmpeg2 media-libs/libmp4v2:0 media-libs/libmkv media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/x264 media-sound/lame ffmpeg? ( =virtual/ffmpeg-9 ) sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 ) ) gtk? ( x11-libs/gtk+:3 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango >=virtual/udev-171[gudev] ) fdk? ( media-libs/fdk-aac )
+REQUIRED_USE=!ffmpeg? ( gstreamer )
+SLOT=0
+SRC_URI=http://handbrake.fr/rotation.php?file=HandBrake-0.9.9.tar.bz2 -> handbrake-0.9.9.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	7ed4a8181d62a098eaa6c8eeacf190c9	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=772fa615f418b6182a12f28af2eadb35
diff --git a/metadata/md5-cache/media-video/handbrake-9999 b/metadata/md5-cache/media-video/handbrake-9999
index c0136c18d27f..3ce0c10d8510 100644
--- a/metadata/md5-cache/media-video/handbrake-9999
+++ b/metadata/md5-cache/media-video/handbrake-9999
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup unpack
-DEPEND=media-libs/a52dec media-libs/libass media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread media-libs/libmpeg2 media-libs/libmp4v2:0 media-libs/libmkv media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/x264 media-sound/lame ffmpeg? ( =virtual/ffmpeg-9 ) sys-libs/glibc:2.2 sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 ) ) gtk? ( x11-libs/gtk+:3 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango >=virtual/udev-171[gudev] ) fdk? ( media-libs/fdk-aac ) || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) dev-lang/yasm sys-devel/automake || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
+DEPEND=media-libs/a52dec media-libs/libass media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread media-libs/libmpeg2 media-libs/libmp4v2:0 media-libs/libmkv media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/x264 media-sound/lame ffmpeg? ( =virtual/ffmpeg-9 ) sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 ) ) gtk? ( x11-libs/gtk+:3 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango >=virtual/udev-171[gudev] ) fdk? ( media-libs/fdk-aac ) || ( dev-lang/python:2.7 dev-lang/python:2.6 dev-lang/python:2.5 ) dev-lang/yasm sys-devel/automake || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool >=sys-apps/sed-4 || ( dev-vcs/subversion[webdav-neon] dev-vcs/subversion[webdav-serf] ) net-misc/rsync
 DESCRIPTION=Open-source, GPL-licensed, multiplatform, multithreaded video transcoder.
 EAPI=5
 HOMEPAGE=http://handbrake.fr/
 IUSE=fdk ffmpeg gstreamer gtk
 LICENSE=GPL-2
-RDEPEND=media-libs/a52dec media-libs/libass media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread media-libs/libmpeg2 media-libs/libmp4v2:0 media-libs/libmkv media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/x264 media-sound/lame ffmpeg? ( =virtual/ffmpeg-9 ) sys-libs/glibc:2.2 sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 ) ) gtk? ( x11-libs/gtk+:3 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango >=virtual/udev-171[gudev] ) fdk? ( media-libs/fdk-aac )
+RDEPEND=media-libs/a52dec media-libs/libass media-libs/libbluray media-libs/libdvdnav media-libs/libdvdread media-libs/libmpeg2 media-libs/libmp4v2:0 media-libs/libmkv media-libs/libsamplerate media-libs/libtheora media-libs/libvorbis media-libs/x264 media-sound/lame ffmpeg? ( =virtual/ffmpeg-9 ) sys-libs/zlib gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 !ffmpeg? ( media-plugins/gst-plugins-mpeg2dec:1.0 ) ) gtk? ( x11-libs/gtk+:3 dev-libs/dbus-glib dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/libnotify x11-libs/pango >=virtual/udev-171[gudev] ) fdk? ( media-libs/fdk-aac )
 REQUIRED_USE=!ffmpeg? ( gstreamer )
 SLOT=0
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-any-r1	7ed4a8181d62a098eaa6c8eeacf190c9	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	subversion	869118194bbbecaa8f935e185befcdb7	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=1a42950e954eff064d816cb749f8be5c
+_md5_=fc7833d25f07f410f550721fd3afe2ae
diff --git a/metadata/md5-cache/media-video/libav-0.8.7 b/metadata/md5-cache/media-video/libav-0.8.7
index 6e5a5fda9174..079a4ab34893 100644
--- a/metadata/md5-cache/media-video/libav-0.8.7
+++ b/metadata/md5-cache/media-video/libav-0.8.7
@@ -4,11 +4,11 @@ DESCRIPTION=Complete solution to record, convert and stream audio and video.
 EAPI=5
 HOMEPAGE=http://libav.org/
 IUSE=+3dnow +3dnowext aac alsa altivec amr bindist +bzip2 cdio cpudetection custom-cflags debug dirac doc +encode faac truetype frei0r +gpl gsm +hardcoded-tables ieee1394 jack jpeg2k +mmx +mmxext mp3 network openssl oss pic pulseaudio +qt-faststart rtmp schroedinger sdl speex ssl +ssse3 static-libs test theora threads v4l vaapi vdpau vorbis vpx X x264 xvid +zlib 3dnow 3dnowext altivec avx mmx mmxext neon ssse3 vis
-KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~x64-solaris ~x86-solaris
 LICENSE=LGPL-2.1 gpl? ( GPL-3 )
 RDEPEND=!media-video/ffmpeg alsa? ( media-libs/alsa-lib ) amr? ( media-libs/opencore-amr ) bzip2? ( app-arch/bzip2 ) cdio? ( || ( dev-libs/libcdio-paranoia =media-sound/lame-3.98.3 ) theora? ( >=media-libs/libtheora-1.1.1[encode] media-libs/libogg ) vorbis? ( media-libs/libvorbis media-libs/libogg ) x264? ( >=media-libs/x264-0.0.20111017 ) xvid? ( >=media-libs/xvid-1.1.0 ) ) truetype? ( media-libs/freetype:2 ) frei0r? ( media-plugins/frei0r-plugins ) gsm? ( >=media-sound/gsm-1.0.12-r1 ) ieee1394? ( media-libs/libdc1394 sys-libs/libraw1394 ) jack? ( media-sound/jack-audio-connection-kit ) jpeg2k? ( >=media-libs/openjpeg-1.3-r2 ) pulseaudio? ( media-sound/pulseaudio ) rtmp? ( >=media-video/rtmpdump-2.2f ) ssl? ( openssl? ( dev-libs/openssl ) !openssl? ( net-libs/gnutls ) ) sdl? ( >=media-libs/libsdl-1.2.13-r1[audio,video] ) schroedinger? ( media-libs/schroedinger ) speex? ( >=media-libs/speex-1.2_beta3 ) vaapi? ( x11-libs/libva ) vdpau? ( x11-libs/libvdpau ) vpx? ( >=media-libs/libvpx-0.9.6 ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libXfixes ) zlib? ( sys-libs/zlib )
 REQUIRED_USE=bindist? ( !faac !openssl ) rtmp? ( network ) amr? ( gpl ) aac? ( gpl ) x264? ( gpl ) X? ( gpl ) cdio? ( gpl ) test? ( encode )
 SLOT=0/0.8
 SRC_URI=http://libav.org/releases/libav-0.8.7.tar.xz test? ( http://dev.gentoo.org/~lu_zero/libav/fate-0.8.2.tar.xz )
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=03f9d22dbd396f8f78102bdc4ae851d9
+_md5_=b03e87329b20df7a1a249f3ecfb8e81a
diff --git a/metadata/md5-cache/net-analyzer/etherape-0.9.13 b/metadata/md5-cache/net-analyzer/etherape-0.9.13
new file mode 100644
index 000000000000..ee254131103a
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/etherape-0.9.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
+DEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] >=gnome-base/libgnomeui-2.0 net-libs/libpcap app-text/scrollkeeper >=sys-devel/gettext-0.11.5 app-text/gnome-doc-utils virtual/pkgconfig >=sys-apps/sed-4
+DESCRIPTION=A graphical network monitor for Unix modeled after etherman
+EAPI=2
+HOMEPAGE=http://etherape.sourceforge.net/
+IUSE=debug
+KEYWORDS=~amd64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=gnome-base/libglade-2.0 gnome-base/libgnomecanvas[glade] >=gnome-base/libgnomeui-2.0 net-libs/libpcap
+SLOT=0
+SRC_URI=mirror://sourceforge/etherape/etherape-0.9.13.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	gnome.org	8fef8f967214f56e08fa92d61163d891	gnome2	96ca31031ada9967bcf96a4fd8977ae4	gnome2-utils	794d2847b4af390a1e020924876c8297	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=97890b3e2f6322112bda028689917471
diff --git a/metadata/md5-cache/net-analyzer/fping-3.5 b/metadata/md5-cache/net-analyzer/fping-3.5
new file mode 100644
index 000000000000..6584ccb3a95f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/fping-3.5
@@ -0,0 +1,10 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=A utility to ping multiple hosts at once
+EAPI=4
+HOMEPAGE=http://fping.org/
+IUSE=ipv6 suid
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos
+LICENSE=fping
+SLOT=0
+SRC_URI=http://fping.org/dist/fping-3.5.tar.gz
+_md5_=b717a873cc99ddddc00fccc605f27b11
diff --git a/metadata/md5-cache/net-analyzer/munin-2.0.13 b/metadata/md5-cache/net-analyzer/munin-2.0.14
similarity index 95%
rename from metadata/md5-cache/net-analyzer/munin-2.0.13
rename to metadata/md5-cache/net-analyzer/munin-2.0.14
index 70905597f92e..40bc5417c040 100644
--- a/metadata/md5-cache/net-analyzer/munin-2.0.13
+++ b/metadata/md5-cache/net-analyzer/munin-2.0.14
@@ -9,6 +9,6 @@ LICENSE=GPL-2
 RDEPEND=dev-lang/perl[berkdb] kernel_linux? ( sys-process/procps ) doc? ( dev-python/sphinx ) asterisk? ( dev-perl/Net-Telnet ) irc? ( dev-perl/Net-IRC ) mysql? ( virtual/mysql dev-perl/Cache-Cache dev-perl/DBD-mysql ) ssl? ( dev-perl/Net-SSLeay ) postgres? ( dev-perl/DBD-Pg dev-db/postgresql-base ) memcached? ( dev-perl/Cache-Memcached ) cgi? ( dev-perl/FCGI ) apache? ( www-servers/apache[apache2_modules_cgi,apache2_modules_cgid,apache2_modules_rewrite] ) syslog? ( virtual/perl-Sys-Syslog ) http? ( dev-perl/libwww-perl ) dhcpd? ( >=net-misc/dhcp-3[server] dev-perl/Net-IP dev-perl/HTTP-Date ) dev-perl/DBI dev-perl/DateManip dev-perl/File-Copy-Recursive dev-perl/List-MoreUtils dev-perl/Log-Log4perl dev-perl/Net-CIDR dev-perl/Net-Netmask dev-perl/Net-SNMP dev-perl/net-server[ipv6(-)?] virtual/perl-Digest-MD5 virtual/perl-Getopt-Long virtual/perl-MIME-Base64 virtual/perl-Storable virtual/perl-Text-Balanced virtual/perl-Time-HiRes !minimal? ( dev-perl/HTML-Template dev-perl/IO-Socket-INET6 dev-perl/URI >=net-analyzer/rrdtool-1.3[perl] virtual/ssh ) virtual/awk ipmi? ( >=sys-libs/freeipmi-1.1.6-r1 ) java? ( >=virtual/jre-1.5 || ( net-analyzer/netcat6 net-analyzer/netcat ) ) !minimal? ( virtual/cron media-fonts/dejavu ) !=dev-java/java-config-2.1.9-r1 )
 REQUIRED_USE=cgi? ( !minimal ) apache? ( cgi )
 SLOT=0
-SRC_URI=mirror://sourceforge/munin/munin-2.0.13.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.13-gentoo-1.tar.xz
+SRC_URI=mirror://sourceforge/munin/munin-2.0.14.tar.gz http://dev.gentoo.org/~flameeyes/munin/munin-2.0.14-gentoo-1.tar.xz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	java-pkg-opt-2	f9bbbe5092225a2059aa9e6a3a2b52f1	java-utils-2	52b7cfbf4f7225fcea7e7f18b6d83328	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=ba8813db72af5a70a3a90a5a4a4b85c4
+_md5_=70d26cd39339af9f163b3af7465bc5ce
diff --git a/metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc1 b/metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc2
similarity index 97%
rename from metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc1
rename to metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc2
index bbf06ee9175a..36f98314a936 100644
--- a/metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc1
+++ b/metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc2
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=>=dev-libs/glib-2.14:2 netlink? ( dev-libs/libnl ) adns? ( !libadns? ( >=net-dns/c-ares-1.5 ) ) crypt? ( dev-libs/libgcrypt ) caps? ( sys-libs/libcap ) geoip? ( dev-libs/geoip ) gtk? ( >=x11-libs/gtk+-2.4.0:2 dev-libs/atk x11-libs/pango x11-misc/xdg-utils ) kerberos? ( virtual/krb5 ) libadns? ( net-libs/adns ) lua? ( >=dev-lang/lua-5.1 ) pcap? ( net-libs/libpcap[-netlink] ) portaudio? ( media-libs/portaudio ) python? ( python_single_target_python2_5? ( dev-lang/python:2.5 ) python_single_target_python2_6? ( dev-lang/python:2.6 ) python_single_target_python2_7? ( dev-lang/python:2.7 ) dev-python/python-exec[python_targets_python2_5(-)?,python_targets_python2_6(-)?,python_targets_python2_7(-)?,python_single_target_python2_5(+)?,python_single_target_python2_6(+)?,python_single_target_python2_7(+)?] ) selinux? ( sec-policy/selinux-wireshark ) smi? ( net-libs/libsmi ) ssl? ( net-libs/gnutls ) zlib? ( sys-libs/zlib !=sys-libs/zlib-1.2.4 )
 REQUIRED_USE=ssl? ( crypt )
-SLOT=0/1.10.0_rc1
-SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.10.0rc1.tar.bz2
+SLOT=0/1.10.0_rc2
+SRC_URI=http://www.wireshark.org/download/src/all-versions/wireshark-1.10.0rc2.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fcaps	c95d1e7b4fd7f7f2a445bc9b17382679	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=6e42c1dc9e921d05c56fba2fcb78bcf4
+_md5_=dabf6a873c7afdbef799f7514872b8fa
diff --git a/metadata/md5-cache/net-dns/pdns-3.2 b/metadata/md5-cache/net-dns/pdns-3.2
index a824dce5f115..159fcded79e1 100644
--- a/metadata/md5-cache/net-dns/pdns-3.2
+++ b/metadata/md5-cache/net-dns/pdns-3.2
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare
-DEPEND=net-libs/polarssl botan? ( =dev-libs/botan-1.10* ) cryptopp? ( dev-libs/crypto++ ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) opendbx? ( dev-db/opendbx ) remote-http? ( net-misc/curl ) tinydns? ( dev-db/cdb ) !static? ( >=dev-libs/boost-1.34:= ) virtual/pkgconfig static? ( >=dev-libs/boost-1.34[static-libs] ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!static? ( net-libs/polarssl >=dev-libs/boost-1.34:= botan? ( =dev-libs/botan-1.10* ) cryptopp? ( dev-libs/crypto++ ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) opendbx? ( dev-db/opendbx ) remote-http? ( net-misc/curl ) tinydns? ( dev-db/cdb ) ) virtual/pkgconfig static? ( net-libs/polarssl[static-libs(+)] >=dev-libs/boost-1.34[static-libs(+)] botan? ( =dev-libs/botan-1.10*[static-libs(+)] ) cryptopp? ( dev-libs/crypto++[static-libs(+)] ) lua? ( dev-lang/lua[static-libs(+)] ) mysql? ( virtual/mysql[static-libs(+)] ) postgres? ( dev-db/postgresql-base[static-libs(+)] ) ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] ) sqlite? ( dev-db/sqlite:3[static-libs(+)] ) odbc? ( dev-db/unixODBC[static-libs(+)] ) opendbx? ( dev-db/opendbx[static-libs(+)] ) remote-http? ( net-misc/curl[static-libs(+)] ) tinydns? ( dev-db/cdb ) ) doc? ( app-doc/doxygen ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=The PowerDNS Daemon
 EAPI=5
 HOMEPAGE=http://www.powerdns.com/
 IUSE=botan cryptopp debug doc ldap lua mydns mysql odbc opendbx postgres remote remote-http sqlite static tinydns
 LICENSE=GPL-2
-RDEPEND=net-libs/polarssl botan? ( =dev-libs/botan-1.10* ) cryptopp? ( dev-libs/crypto++ ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) opendbx? ( dev-db/opendbx ) remote-http? ( net-misc/curl ) tinydns? ( dev-db/cdb ) !static? ( >=dev-libs/boost-1.34:= )
+RDEPEND=!static? ( net-libs/polarssl >=dev-libs/boost-1.34:= botan? ( =dev-libs/botan-1.10* ) cryptopp? ( dev-libs/crypto++ ) lua? ( dev-lang/lua ) mysql? ( virtual/mysql ) postgres? ( dev-db/postgresql-base:= ) ldap? ( >=net-nds/openldap-2.0.27-r4 ) sqlite? ( dev-db/sqlite:3 ) odbc? ( dev-db/unixODBC ) opendbx? ( dev-db/opendbx ) remote-http? ( net-misc/curl ) tinydns? ( dev-db/cdb ) )
 REQUIRED_USE=mydns? ( mysql )
 SLOT=0
 SRC_URI=http://downloads.powerdns.com/releases/pdns-3.2.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=e596fc2aba39d7a9f4e1f69f57c1b0b0
+_md5_=6e7e87e4b98ed7fc0dfb131aac1c59da
diff --git a/metadata/md5-cache/net-ftp/lftp-4.4.7 b/metadata/md5-cache/net-ftp/lftp-4.4.7
new file mode 100644
index 000000000000..fbcf255f94f5
--- /dev/null
+++ b/metadata/md5-cache/net-ftp/lftp-4.4.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure prepare
+DEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1 =sys-devel/libtool-2* app-arch/xz-utils dev-lang/perl nls? ( sys-devel/gettext ) virtual/pkgconfig || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DESCRIPTION=A sophisticated ftp/sftp/http/https/torrent client and file transfer program
+EAPI=5
+HOMEPAGE=http://lftp.yar.ru/
+IUSE=+gnutls nls openssl socks5 +ssl linguas_cs linguas_de linguas_es linguas_fr linguas_it linguas_ja linguas_ko linguas_pl linguas_pt_BR linguas_ru linguas_zh_CN linguas_zh_HK linguas_zh_TW
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-3
+RDEPEND=dev-libs/expat >=sys-libs/ncurses-5.1 socks5? ( >=net-proxy/dante-1.1.12 virtual/pam ) ssl? ( gnutls? ( >=net-libs/gnutls-1.2.3 ) openssl? ( >=dev-libs/openssl-0.9.6 ) ) >=sys-libs/readline-5.1
+REQUIRED_USE=ssl? ( ^^ ( openssl gnutls ) )
+SLOT=0
+SRC_URI=ftp://ftp.yars.free.net/pub/source/lftp/lftp-4.4.7.tar.xz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=63094054949ff47d7d0419f675b04fbd
diff --git a/metadata/md5-cache/net-im/skype-4.2.0.11 b/metadata/md5-cache/net-im/skype-4.2.0.11
new file mode 100644
index 000000000000..032cbdc7b625
--- /dev/null
+++ b/metadata/md5-cache/net-im/skype-4.2.0.11
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst
+DEPEND=>=sys-apps/sed-4
+DESCRIPTION=An P2P Internet Telephony (VoiceIP) client
+EAPI=5
+HOMEPAGE=http://www.skype.com/
+IUSE=pax_kernel selinux
+KEYWORDS=~amd64 ~x86
+LICENSE=skype-4.0.0.7-copyright skype-4.0.0.7-third-party_attributions.txt
+RDEPEND=virtual/ttf-fonts amd64? ( >=app-emulation/emul-linux-x86-baselibs-20120520 >=app-emulation/emul-linux-x86-qtlibs-20120520 >=app-emulation/emul-linux-x86-soundlibs-20120520 || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] x11-libs/libXScrnSaver[abi_x86_32] x11-libs/libXv[abi_x86_32] ) >=app-emulation/emul-linux-x86-xlibs-20120520 ) ) !amd64? ( media-libs/alsa-lib x11-libs/libX11 x11-libs/libXext x11-libs/libXScrnSaver x11-libs/libXv dev-qt/qtcore:4 dev-qt/qtdbus:4 dev-qt/qtgui:4[accessibility,dbus] dev-qt/qtwebkit:4 ) selinux? ( sec-policy/selinux-skype )
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=http://download.skype.com/linux/skype-4.2.0.11.tar.bz2
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	gnome2-utils	794d2847b4af390a1e020924876c8297	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=ec4b9482370bf0ae4e7175d769ae8be8
diff --git a/metadata/md5-cache/net-irc/weechat-0.4.1 b/metadata/md5-cache/net-irc/weechat-0.4.1
new file mode 100644
index 000000000000..4204f77566e9
--- /dev/null
+++ b/metadata/md5-cache/net-irc/weechat-0.4.1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/libgcrypt net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 ) doc? ( app-text/asciidoc dev-util/source-highlight ) nls? ( >=sys-devel/gettext-0.15 ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Portable and multi-interface IRC client.
+EAPI=5
+HOMEPAGE=http://weechat.org/
+IUSE=guile lua +perl +python ruby tcl +alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer +irc doc nls +ssl linguas_cs linguas_de linguas_es linguas_fr linguas_hu linguas_it linguas_ja linguas_pl linguas_pt_BR linguas_ru python_targets_python2_7 python_targets_python3_2 python_targets_python3_3 python_single_target_python2_7 python_single_target_python3_2 python_single_target_python3_3
+KEYWORDS=~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux
+LICENSE=GPL-3
+RDEPEND=dev-libs/libgcrypt net-misc/curl[ssl] sys-libs/ncurses sys-libs/zlib charset? ( virtual/libiconv ) guile? ( dev-scheme/guile ) lua? ( dev-lang/lua[deprecated] ) nls? ( virtual/libintl ) perl? ( dev-lang/perl ) python? ( python_single_target_python2_7? ( dev-lang/python:2.7 ) python_single_target_python3_2? ( dev-lang/python:3.2 ) python_single_target_python3_3? ( dev-lang/python:3.3 ) dev-python/python-exec[python_targets_python2_7(-)?,python_targets_python3_2(-)?,python_targets_python3_3(-)?,python_single_target_python2_7(+)?,python_single_target_python3_2(+)?,python_single_target_python3_3(+)?] ) ruby? ( >=dev-lang/ruby-1.9 ) ssl? ( net-libs/gnutls ) spell? ( app-text/aspell ) tcl? ( >=dev-lang/tcl-8.4.15 )
+SLOT=0
+SRC_URI=http://weechat.org/files/src/weechat-0.4.1.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=51739cc47f86d58329a03c601f62fbd1
diff --git a/metadata/md5-cache/net-libs/gnutls-3.2.0 b/metadata/md5-cache/net-libs/gnutls-3.2.0
index 3d7eccdf00b2..ead99669aae9 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.2.0
+++ b/metadata/md5-cache/net-libs/gnutls-3.2.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) >=sys-devel/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.7[gmp] sys-devel/autogen dane? ( net-dns/unbound ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 ) >=sys-devel/automake-1.11.6 virtual/pkgconfig doc? ( dev-util/gtk-doc ) nls? ( sys-devel/gettext ) test? ( app-misc/datefudge ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=A TLS 1.2 and SSL 3.0 implementation for the GNU project
 EAPI=5
 HOMEPAGE=http://www.gnutls.org/
 IUSE=+cxx dane doc examples guile nls pkcs11 static-libs test zlib linguas_en linguas_cs linguas_de linguas_fi linguas_fr linguas_it linguas_ms linguas_nl linguas_pl linguas_sv linguas_uk linguas_vi linguas_zh_CN
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris
 LICENSE=GPL-3 LGPL-3
-RDEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.5[gmp] sys-devel/autogen dane? ( net-dns/unbound ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 )
+RDEPEND=>=dev-libs/libtasn1-2.14 >=dev-libs/nettle-2.7[gmp] sys-devel/autogen dane? ( net-dns/unbound ) guile? ( >=dev-scheme/guile-1.8[networking] ) nls? ( virtual/libintl ) pkcs11? ( >=app-crypt/p11-kit-0.11 ) zlib? ( >=sys-libs/zlib-1.2.3.1 )
 SLOT=0
 SRC_URI=ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/gnutls-3.2.0.tar.xz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
-_md5_=95d69dc153a2b755c5c8ddd297a3dfc2
+_md5_=617cff627d540896782613c71a5ad6c3
diff --git a/metadata/md5-cache/net-libs/libkgapi-0.4.4 b/metadata/md5-cache/net-libs/libkgapi-0.4.4
index 173ad43a3cdd..88fe7dda6e80 100644
--- a/metadata/md5-cache/net-libs/libkgapi-0.4.4
+++ b/metadata/md5-cache/net-libs/libkgapi-0.4.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup t
 DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/qjson oldpim? ( dev-libs/boost ) !oldpim? ( >=kde-base/kdepimlibs-4.6.0:4[aqua=,semantic-desktop] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
 DESCRIPTION=Library for accessing Google calendar and contact resources
 EAPI=4
-HOMEPAGE=http://www.kde.org/
+HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libkgapi
 IUSE=oldpim aqua
 KEYWORDS=amd64 ~arm ppc ppc64 x86
 LICENSE=GPL-2
@@ -10,4 +10,4 @@ RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/qjson oldpi
 SLOT=4
 SRC_URI=mirror://kde/stable/libkgapi/0.4.4/src/libkgapi-0.4.4.tar.bz2
 _eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=a8675d9a4c312e48c813c9ce3fbee6fe
+_md5_=a0e8b839dfbeb561b084fc04bf4a10d8
diff --git a/metadata/md5-cache/net-libs/libkgapi-2.0.0 b/metadata/md5-cache/net-libs/libkgapi-2.0.0
new file mode 100644
index 000000000000..3638be523172
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libkgapi-2.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/qjson oldpim? ( dev-libs/boost ) !oldpim? ( >=kde-base/kdepimlibs-4.6.0:4[aqua=,semantic-desktop] ) >=sys-apps/sed-4 sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 ) dev-util/automoc virtual/pkgconfig !aqua? ( >=x11-libs/libXtst-1.1.0 x11-proto/xf86vidmodeproto ) dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+DESCRIPTION=Library for accessing Google calendar and contact resources
+EAPI=5
+HOMEPAGE=https://projects.kde.org/projects/extragear/libs/libkgapi
+IUSE=oldpim aqua
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=>=kde-base/kdepimlibs-4.4:4[aqua=,semantic-desktop] dev-libs/qjson oldpim? ( dev-libs/boost ) !oldpim? ( >=kde-base/kdepimlibs-4.6.0:4[aqua=,semantic-desktop] ) >=kde-base/oxygen-icons-4.4:4[aqua=] dev-lang/perl >=dev-qt/qt3support-4.8.0:4[accessibility] >=dev-qt/qtcore-4.8.0:4[qt3support,ssl] >=dev-qt/qtdbus-4.8.0:4 >=dev-qt/qtgui-4.8.0:4[accessibility,dbus] >=dev-qt/qtscript-4.8.0:4 >=dev-qt/qtsql-4.8.0:4[qt3support] >=dev-qt/qtsvg-4.8.0:4 >=dev-qt/qttest-4.8.0:4 >=dev-qt/qtwebkit-4.8.0:4 !aqua? ( x11-libs/libXext x11-libs/libXt x11-libs/libXxf86vm x11-libs/libXcomposite x11-libs/libxkbfile ) >=kde-base/kdelibs-4.4:4[aqua=]
+SLOT=4
+SRC_URI=mirror://kde/stable/libkgapi/2.0.0/src/libkgapi-2.0.0.tar.bz2
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	kde4-base	2cedb58982ff5f6a497a00d05779530a	kde4-functions	597dae8331dc9b795e3a5797bf7da048	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=bf81d6182d403085321a2db09e7dccde
diff --git a/metadata/md5-cache/net-mail/libpst-0.6.59 b/metadata/md5-cache/net-mail/libpst-0.6.59
new file mode 100644
index 000000000000..715d398c5489
--- /dev/null
+++ b/metadata/md5-cache/net-mail/libpst-0.6.59
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install prepare setup
+DEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf virtual/libiconv virtual/pkgconfig dii? ( media-libs/gd[png] ) python? ( >=dev-libs/boost-1.48[python] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool python? ( =dev-lang/python-2* )
+DESCRIPTION=Tools and library for reading Outlook files (.pst format)
+EAPI=4
+HOMEPAGE=http://www.five-ten-sg.com/libpst/
+IUSE=debug dii doc python static-libs
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dii? ( media-gfx/imagemagick[png] ) gnome-extra/libgsf python? ( =dev-lang/python-2* )
+SLOT=0
+SRC_URI=http://www.five-ten-sg.com/libpst/packages/libpst-0.6.59.tar.gz
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python	dd56675d8e9f7e85d815a28c87383141	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=3f53150a8756801ee12caf5d5fad99e8
diff --git a/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.13 b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.13
new file mode 100644
index 000000000000..e75f84f5c5b9
--- /dev/null
+++ b/metadata/md5-cache/net-misc/apt-cacher-ng-0.7.13
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-arch/bzip2 sys-libs/zlib app-arch/xz-utils dev-util/cmake sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++
+EAPI=5
+HOMEPAGE=http://www.unix-ag.uni-kl.de/~bloch/acng/ http://packages.qa.debian.org/a/apt-cacher-ng.html
+IUSE=doc fuse lzma tcpd
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-4 ZLIB public-domain
+RDEPEND=app-arch/bzip2 sys-libs/zlib lzma? ( app-arch/xz-utils ) fuse? ( sys-fs/fuse ) tcpd? ( sys-apps/tcp-wrappers ) dev-lang/perl
+SLOT=0
+SRC_URI=mirror://debian/pool/main/a/apt-cacher-ng/apt-cacher-ng_0.7.13.orig.tar.xz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=38a7cea6671ed9a74a83e65d5028ba34
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.0 b/metadata/md5-cache/net-misc/rabbitmq-server-3.1.0
deleted file mode 100644
index c94660e6d2df..000000000000
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.0
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install preinst setup
-DEPEND=dev-lang/erlang app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5 app-text/xmlto dev-libs/libxslt dev-python/simplejson virtual/pkgconfig
-DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang.
-EAPI=5
-HOMEPAGE=http://www.rabbitmq.com/
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2 MPL-1.1
-RDEPEND=dev-lang/erlang
-SLOT=0
-SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.1.0/rabbitmq-server-3.1.0.tar.gz
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=264f2401d07b02e27112a76774dbc168
diff --git a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.1 b/metadata/md5-cache/net-misc/rabbitmq-server-3.1.1
index a4204f84b2dd..88ddbc540418 100644
--- a/metadata/md5-cache/net-misc/rabbitmq-server-3.1.1
+++ b/metadata/md5-cache/net-misc/rabbitmq-server-3.1.1
@@ -3,11 +3,11 @@ DEPEND=dev-lang/erlang app-arch/zip app-arch/unzip app-text/docbook-xml-dtd:4.5
 DESCRIPTION=RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang.
 EAPI=5
 HOMEPAGE=http://www.rabbitmq.com/
-IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7
+IUSE=python_targets_python2_5 python_targets_python2_6 python_targets_python2_7 python_single_target_python2_5 python_single_target_python2_6 python_single_target_python2_7
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2 MPL-1.1
 RDEPEND=dev-lang/erlang
 SLOT=0
 SRC_URI=http://www.rabbitmq.com/releases/rabbitmq-server/v3.1.1/rabbitmq-server-3.1.1.tar.gz
-_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multibuild	32fd04fe3ee97494341710886fd70dfe	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-r1	094dc7421f9aea7525b85b899f67e62a	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=bfbd75672b61ab8992b2a03bb07ab493
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	systemd	3421a5715404244e4827acd1cf8ce654	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9a791c4fdd9138c22d226719b1c70934
diff --git a/metadata/md5-cache/sci-chemistry/numbat-0.999 b/metadata/md5-cache/sci-chemistry/numbat-0.999-r1
similarity index 90%
rename from metadata/md5-cache/sci-chemistry/numbat-0.999
rename to metadata/md5-cache/sci-chemistry/numbat-0.999-r1
index b803594731fd..b1a4f94b7c65 100644
--- a/metadata/md5-cache/sci-chemistry/numbat-0.999
+++ b/metadata/md5-cache/sci-chemistry/numbat-0.999-r1
@@ -5,8 +5,8 @@ EAPI=5
 HOMEPAGE=http://www.nmr.chem.uu.nl/~christophe/numbat.html
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-3
-RDEPEND=gnome-base/libglade:2.0 sci-libs/gsl x11-libs/gtk+:2 sci-chemistry/molmol sci-chemistry/pymol
+RDEPEND=gnome-base/libglade:2.0 sci-libs/gsl x11-libs/gtk+:2 sci-chemistry/molmol sci-chemistry/pymol sci-visualization/gnuplot
 SLOT=0
 SRC_URI=http://comp-bio.anu.edu.au/private/downloads/Numbat/Numbat-0.999.tar.gz
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7c11ec0c4b75b50282ec943ef9df2b17	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=17888af96ef11100401a1e6a05f52e89
+_md5_=b7c7f0effe772ff87c855fd2f6fff462
diff --git a/metadata/md5-cache/sci-libs/ceres-solver-1.6.0 b/metadata/md5-cache/sci-libs/ceres-solver-1.6.0
new file mode 100644
index 000000000000..6a6d59670a14
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/ceres-solver-1.6.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-cpp/eigen:3 dev-cpp/glog[gflags?] protobuf? ( dev-libs/protobuf ) sparse? ( sci-libs/amd sci-libs/camd sci-libs/ccolamd sci-libs/cholmod[metis?] sci-libs/colamd sci-libs/cxsparse virtual/blas virtual/lapack ) sparse? ( virtual/pkgconfig ) doc? ( dev-python/sphinx ) sys-devel/make >=dev-util/cmake-2.8.9 userland_GNU? ( >=sys-apps/findutils-4.4.0 )
+DESCRIPTION=Nonlinear least-squares minimizer
+EAPI=5
+HOMEPAGE=https://code.google.com/p/ceres-solver/
+IUSE=doc examples gflags metis openmp protobuf +schur +sparse static-libs test
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-cpp/eigen:3 dev-cpp/glog[gflags?] protobuf? ( dev-libs/protobuf ) sparse? ( sci-libs/amd sci-libs/camd sci-libs/ccolamd sci-libs/cholmod[metis?] sci-libs/colamd sci-libs/cxsparse virtual/blas virtual/lapack )
+REQUIRED_USE=test? ( gflags )
+SLOT=0
+SRC_URI=https://ceres-solver.googlecode.com/files/ceres-solver-1.6.0.tar.gz
+_eclasses_=base	ec46b36a6f6fd1d0b505a33e0b74e413	cmake-utils	bc8bbf26de246f74e2901a3696ad96d6	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=7b44dd7f8aa3b19fc6d85d33d367bb62
diff --git a/metadata/md5-cache/sys-cluster/crmsh-1.2.5-r1 b/metadata/md5-cache/sci-libs/mpir-2.6.0-r2
similarity index 53%
rename from metadata/md5-cache/sys-cluster/crmsh-1.2.5-r1
rename to metadata/md5-cache/sci-libs/mpir-2.6.0-r2
index c1af383dc0cf..4289fa96cda9 100644
--- a/metadata/md5-cache/sys-cluster/crmsh-1.2.5-r1
+++ b/metadata/md5-cache/sci-libs/mpir-2.6.0-r2
@@ -1,12 +1,12 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=sys-cluster/pacemaker-1.1.8
-DESCRIPTION=Pacemaker command line interface for management and configuration
-EAPI=4
-HOMEPAGE=https://savannah.nongnu.org/projects/crmsh/
-KEYWORDS=~amd64 ~hppa ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-cluster/pacemaker-1.1.8
+DEPEND=x86? ( dev-lang/yasm ) amd64? ( dev-lang/yasm )
+DESCRIPTION=Library for arbitrary precision integer arithmetic (fork of gmp)
+EAPI=5
+HOMEPAGE=http://www.mpir.org/
+IUSE=+cxx cpudetection static-libs
+KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
 SLOT=0
-SRC_URI=http://hg.savannah.gnu.org/hgweb/crmsh/archive/ef3f08547688.tar.bz2
+SRC_URI=http://www.mpir.org/mpir-2.6.0.tar.lzma
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7c11ec0c4b75b50282ec943ef9df2b17	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=7f83ea6d7f3e87756615b14013f8ca9b
+_md5_=66da5720af7ef1bfeebd4429d7034463
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-0.8.6 b/metadata/md5-cache/sys-apps/gptfdisk-0.8.6
index 948d8fbe2c09..16fcf871e1f1 100644
--- a/metadata/md5-cache/sys-apps/gptfdisk-0.8.6
+++ b/metadata/md5-cache/sys-apps/gptfdisk-0.8.6
@@ -10,4 +10,4 @@ RDEPEND=!static? ( dev-libs/popt ncurses? ( >=sys-libs/ncurses-5.7-r7 ) icu? ( d
 SLOT=0
 SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk-0.8.6.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=55ed75284f77c62a174f2429dce47e10
+_md5_=da6924fa6fa70deab67322d3a4fe5266
diff --git a/metadata/md5-cache/sys-apps/hwids-20130523 b/metadata/md5-cache/sys-apps/hwids-20130523
new file mode 100644
index 000000000000..849787296330
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/hwids-20130523
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst prepare
+DEPEND=udev? ( dev-lang/perl >=virtual/udev-197-r1 ) virtual/pkgconfig
+DESCRIPTION=Hardware (PCI, USB, OUI, IAB) IDs databases
+EAPI=5
+HOMEPAGE=https://github.com/gentoo/hwids
+IUSE=+udev
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux
+LICENSE=|| ( GPL-2 BSD ) public-domain
+RDEPEND=!=dev-lang/perl-5.8
 SLOT=0
 SRC_URI=mirror://sourceforge/lnxhc/lnxhc-1.2.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=62623ee39c6b38f5478c56358dfb7f76
+_md5_=94208f1caf6272fd88508f87ebe6506b
diff --git a/metadata/md5-cache/sys-apps/which-2.20-r1 b/metadata/md5-cache/sys-apps/which-2.20-r1
new file mode 100644
index 000000000000..f2f29f5cce0a
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/which-2.20-r1
@@ -0,0 +1,10 @@
+DEFINED_PHASES=prepare
+DESCRIPTION=Prints out location of specified executables that are in your path
+EAPI=4
+HOMEPAGE=http://www.xs4all.nl/~carlo17/which/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=GPL-3
+SLOT=0
+SRC_URI=http://www.xs4all.nl/~carlo17/which/which-2.20.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c66e5478487d082f696920577f06119c
diff --git a/metadata/md5-cache/sys-cluster/crmsh-1.2.5-r2 b/metadata/md5-cache/sys-cluster/crmsh-1.2.5-r2
new file mode 100644
index 000000000000..5e5542b1ddee
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/crmsh-1.2.5-r2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=sys-cluster/pacemaker-1.1.8 || ( dev-lang/python:2.7 dev-lang/python:2.6 )
+DESCRIPTION=Pacemaker command line interface for management and configuration
+EAPI=5
+HOMEPAGE=https://savannah.nongnu.org/projects/crmsh/
+IUSE=python python_targets_python2_7 python_single_target_python2_7
+KEYWORDS=~amd64 ~hppa ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-cluster/pacemaker-1.1.8 || ( dev-lang/python:2.7 dev-lang/python:2.6 )
+SLOT=0
+SRC_URI=http://hg.savannah.gnu.org/hgweb/crmsh/archive/ef3f08547688.tar.bz2
+_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7c11ec0c4b75b50282ec943ef9df2b17	eutils	f31a0ec0d081047cbf9c0bbb4822d831	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	python-single-r1	7e219c03c7f3c029a5d1030f38aeafef	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=9fb5e45af147b45eb5870807a4b73997
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4 b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
index 766b87385240..6892f4852c89 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
+++ b/metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=3
 HOMEPAGE=http://sources.redhat.com/lvm2/
 IUSE=readline static static-libs clvm cman +lvm1 selinux +udev +thin
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=3
 HOMEPAGE=http://sources.redhat.com/lvm2/
 IUSE=readline static static-libs clvm cman +lvm1 selinux +udev +thin
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=5
 HOMEPAGE=http://sources.redhat.com/lvm2/
 IUSE=readline static static-libs clvm cman +lvm1 selinux +udev +thin
 KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
+DEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev[static-libs?] ) virtual/pkgconfig >=sys-devel/binutils-2.20.1-r1 static? ( virtual/udev[static-libs] ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig
 DESCRIPTION=User-land utilities for LVM2 (device-mapper) software.
 EAPI=5
 HOMEPAGE=http://sources.redhat.com/lvm2/
 IUSE=readline static static-libs clvm cman +lvm1 selinux +udev +thin
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
-RDEPEND=!!sys-fs/device-mapper readline? ( sys-libs/readline ) clvm? ( =sys-cluster/libdlm-3* cman? ( =sys-cluster/cman-3* ) ) udev? ( virtual/udev ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-apps/baselayout-2.1-r1 !!sys-fs/lvm-user !!sys-fs/clvm >=sys-apps/util-linux-2.16 thin? ( sys-block/thin-provisioning-tools ) !=sys-devel/binutils-2.11.90.0.31 )
+DESCRIPTION=Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and UKSM
+EAPI=5
+HOMEPAGE=http://pf.natalenko.name/
+IUSE=symlink build
+KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2 freedist
+PDEPEND=!build? ( virtual/dev-manager )
+RDEPEND=!build? ( >=sys-libs/ncurses-5.2 sys-devel/make dev-lang/perl sys-devel/bc )
+RESTRICT=binchecks strip
+SLOT=3.9.3
+SRC_URI=mirror://kernel/linux/kernel/v3.x/linux-3.9.tar.xz http://pf.natalenko.name/sources/3.9/patch-3.9.3-pf.bz2
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	kernel-2	353d0aef1046938e432ba587875e2027	multilib	892e597faee02a5b94eb02ab512e7622	readme.gentoo	bbf42a03f0727dd40e4878a6affa96df	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=dfebc1e3115eb8150d53c20b22f7a752
diff --git a/metadata/md5-cache/www-client/chromium-27.0.1453.93 b/metadata/md5-cache/www-client/chromium-27.0.1453.93
index 383689c7fcd5..8df5225ec581 100644
--- a/metadata/md5-cache/www-client/chromium-27.0.1453.93
+++ b/metadata/md5-cache/www-client/chromium-27.0.1453.93
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.17* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
+DEPEND==app-accessibility/speech-dispatcher-0.7*:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.17* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) || ( dev-lang/python:2.7 dev-lang/python:2.6 ) !arm? ( >=dev-lang/nacl-toolchain-newlib-0_p9093 dev-lang/yasm ) dev-lang/perl dev-python/ply dev-python/simplejson >=dev-util/gperf-3.0.3 sys-apps/hwids >=sys-devel/bison-2.4.3 sys-devel/flex >=sys-devel/make-3.81-r2 virtual/pkgconfig test? ( dev-python/pyftpdlib ) >=sys-apps/sed-4 test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
 DESCRIPTION=Open-source version of Google Chrome web browser
 EAPI=5
 HOMEPAGE=http://chromium.org/
 IUSE=bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-ffmpeg system-sqlite tcmalloc custom-cflags +linguas_am +linguas_ar +linguas_bg +linguas_bn +linguas_ca +linguas_cs +linguas_da +linguas_de +linguas_el +linguas_en_GB +linguas_es +linguas_es_LA +linguas_et +linguas_fa +linguas_fi +linguas_fil +linguas_fr +linguas_gu +linguas_he +linguas_hi +linguas_hr +linguas_hu +linguas_id +linguas_it +linguas_ja +linguas_kn +linguas_ko +linguas_lt +linguas_lv +linguas_ml +linguas_mr +linguas_ms +linguas_nb +linguas_nl +linguas_pl +linguas_pt_BR +linguas_pt_PT +linguas_ro +linguas_ru +linguas_sk +linguas_sl +linguas_sr +linguas_sv +linguas_sw +linguas_ta +linguas_te +linguas_th +linguas_tr +linguas_uk +linguas_vi +linguas_zh_CN +linguas_zh_TW test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=app-accessibility/speech-dispatcher-0.8:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.17* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts
+RDEPEND==app-accessibility/speech-dispatcher-0.7*:= app-arch/bzip2:= system-sqlite? ( dev-db/sqlite:3 ) cups? ( dev-libs/libgcrypt:= >=net-print/cups-1.3.11:= ) >=dev-lang/v8-3.17.6:= =dev-lang/v8-3.17* >=dev-libs/elfutils-0.149 dev-libs/expat:= >=dev-libs/icu-49.1.1-r1:= >=dev-libs/jsoncpp-0.5.0-r1:= >=dev-libs/libevent-1.4.13:= dev-libs/libxml2:=[icu] dev-libs/libxslt:= dev-libs/nspr:= >=dev-libs/nss-3.12.3:= dev-libs/protobuf:= dev-libs/re2:= gnome? ( >=gnome-base/gconf-2.24.0:= ) gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2:= ) gps? ( >=sci-geosciences/gpsd-3.7:=[shm] ) >=media-libs/alsa-lib-1.0.19:= media-libs/flac:= media-libs/harfbuzz:= >=media-libs/libjpeg-turbo-1.2.0-r1:= media-libs/libpng:0= media-libs/libvpx:= >=media-libs/libwebp-0.2.0_rc1:= !arm? ( !x86? ( >=media-libs/mesa-9.1:=[gles2] ) ) media-libs/opus:= media-libs/speex:= pulseaudio? ( media-sound/pulseaudio:= ) system-ffmpeg? ( >=media-video/ffmpeg-1.0:=[opus] ) sys-apps/dbus:= sys-apps/pciutils:= sys-libs/zlib:=[minizip] virtual/udev virtual/libusb:1= x11-libs/gtk+:2= x11-libs/libXinerama:= x11-libs/libXScrnSaver:= x11-libs/libXtst:= kerberos? ( virtual/krb5 ) selinux? ( sec-policy/selinux-chromium ) !=www-client/chromium-9999 x11-misc/xdg-utils virtual/ttf-fonts
 SLOT=0
 SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.93-lite.tar.xz test? ( https://commondatastorage.googleapis.com/chromium-browser-official/chromium-27.0.1453.93-testdata.tar.xz )
 _eclasses_=chromium	10deb47dfb7657ba0fc7814da0bad35e	eutils	f31a0ec0d081047cbf9c0bbb4822d831	fdo-mime	0acfe1a88fd8751a1d5dc671168219fa	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	gnome2-utils	794d2847b4af390a1e020924876c8297	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	multilib	892e597faee02a5b94eb02ab512e7622	pax-utils	2424f959506320f5196de8f79fa05297	portability	536c5e70c5fb252ed3b769e04aa3f05b	python-any-r1	7ed4a8181d62a098eaa6c8eeacf190c9	python-utils-r1	9fc80a4f06f33ede447b5647fddca301	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=e2c72a48e0027d586a4e06d35079ce15
+_md5_=f80454b9c72a4fdcd2a46ea5ee0a3c5b
diff --git a/metadata/md5-cache/x11-drivers/nvidia-drivers-319.23 b/metadata/md5-cache/x11-drivers/nvidia-drivers-319.23
new file mode 100644
index 000000000000..15c32c902a06
--- /dev/null
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-319.23
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare prerm pretend setup unpack
+DEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) app-arch/xz-utils kernel_linux? ( virtual/linux-sources ) kernel_linux? ( virtual/modutils ) sys-apps/sed kernel_linux? ( virtual/linux-sources ) sys-apps/pciutils virtual/pkgconfig
+DESCRIPTION=NVIDIA X11 driver and GLX libraries
+EAPI=5
+HOMEPAGE=http://www.nvidia.com/
+IUSE=acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X kernel_linux
+KEYWORDS=-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd
+LICENSE=GPL-2 NVIDIA-r1
+RDEPEND=app-admin/eselect-opencl kernel_linux? ( >=sys-libs/glibc-2.6.1 ) X? ( >=app-admin/eselect-opengl-1.0.9 ) acpi? ( sys-power/acpid ) tools? ( dev-libs/atk dev-libs/glib x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/libX11 x11-libs/libXext x11-libs/pango[X] ) X? ( =x11-libs/libvdpau-0.3-r1 multilib? ( || ( ( x11-libs/libX11[abi_x86_32] x11-libs/libXext[abi_x86_32] ) app-emulation/emul-linux-x86-xlibs ) ) ) kernel_linux? ( virtual/modutils )
+REQUIRED_USE=tools? ( X )
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=amd64-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86_64/319.23/NVIDIA-FreeBSD-x86_64-319.23.tar.gz ) amd64? ( http://us.download.nvidia.com/XFree86/Linux-x86_64/319.23/NVIDIA-Linux-x86_64-319.23.run ) x86-fbsd? ( http://us.download.nvidia.com/XFree86/FreeBSD-x86/319.23/NVIDIA-FreeBSD-x86-319.23.tar.gz ) x86? ( http://us.download.nvidia.com/XFree86/Linux-x86/319.23/NVIDIA-Linux-x86-319.23.run )
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	linux-info	dd8fdcccc30f117673b4cba4ed4f74a7	linux-mod	c9d4931960ba253061ad823a8508bff5	multilib	892e597faee02a5b94eb02ab512e7622	nvidia-driver	abfc71eaf192f340dfc5292211ea2b54	portability	536c5e70c5fb252ed3b769e04aa3f05b	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	udev	a9a8d051efb42bfe884c1db82ce161de	unpacker	658a981a81fd7cb0767315a541bab01d	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	6601b4c5b3f019a993db59a50e1854e4
+_md5_=1efd42bc034fac6422b8c8068def5937
diff --git a/metadata/md5-cache/x11-libs/libdrm-2.4.45 b/metadata/md5-cache/x11-libs/libdrm-2.4.45
index e2a67cb18897..8ec4e87e2f27 100644
--- a/metadata/md5-cache/x11-libs/libdrm-2.4.45
+++ b/metadata/md5-cache/x11-libs/libdrm-2.4.45
@@ -4,7 +4,7 @@ DESCRIPTION=X.Org libdrm library
 EAPI=5
 HOMEPAGE=http://dri.freedesktop.org/
 IUSE=video_cards_exynos video_cards_freedreno video_cards_intel video_cards_nouveau video_cards_omap video_cards_radeon video_cards_vmware libkms static-libs
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=dev-libs/libpthread-stubs video_cards_intel? ( >=x11-libs/libpciaccess-0.10 )
 REQUIRED_USE=video_cards_exynos? ( libkms )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=http://dri.freedesktop.org/libdrm/libdrm-2.4.45.tar.bz2
 _eclasses_=autotools	16761a2f972abd686713e5967ff3c754	autotools-utils	7c11ec0c4b75b50282ec943ef9df2b17	eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	libtool	b1c8688e60f9580bcb9bb46e08737eb1	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	a2130e6fc4aa4c6a24b265ca0cbcc2b6	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28	xorg-2	647bf09b251366e5d15095e1c7a7dda4
-_md5_=685d91f10c90e68248a8fb2aebb10fff
+_md5_=8f6b7cb48b215692729d64d4ae347d94
diff --git a/metadata/md5-cache/x11-misc/dmenu-4.5-r3 b/metadata/md5-cache/x11-misc/dmenu-4.5-r3
index 836656ba292c..6cd40e9773e6 100644
--- a/metadata/md5-cache/x11-misc/dmenu-4.5-r3
+++ b/metadata/md5-cache/x11-misc/dmenu-4.5-r3
@@ -10,4 +10,4 @@ RDEPEND=x11-libs/libX11 xft? ( x11-libs/libXft ) xinerama? ( x11-libs/libXineram
 SLOT=0
 SRC_URI=http://dl.suckless.org/tools/dmenu-4.5.tar.gz
 _eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
-_md5_=0c97d13619b7da4d0c0777e0552604b9
+_md5_=0ff3568b46c9059e2935aac1ee005b80
diff --git a/metadata/md5-cache/x11-wm/goomwwm-1.0.0 b/metadata/md5-cache/x11-wm/goomwwm-1.0.0
new file mode 100644
index 000000000000..287ddae8154b
--- /dev/null
+++ b/metadata/md5-cache/x11-wm/goomwwm-1.0.0
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install
+DEPEND=x11-libs/libXft x11-libs/libX11 x11-libs/libXinerama virtual/pkgconfig x11-proto/xineramaproto x11-proto/xproto
+DESCRIPTION=Get out of my way, Window Manager!
+EAPI=5
+HOMEPAGE=http://aerosuidae.net/goomwwm/
+IUSE=debug
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=x11-libs/libXft x11-libs/libX11 x11-libs/libXinerama
+SLOT=0
+SRC_URI=http://aerosuidae.net/goomwwm/goomwwm-1.0.0.tar.gz
+_eclasses_=eutils	f31a0ec0d081047cbf9c0bbb4822d831	flag-o-matic	d900015de4e092f26d8c0a18b6bd60de	multilib	892e597faee02a5b94eb02ab512e7622	toolchain-funcs	7ffd28a8c7eea27218865352bfd3ab2f	user	d0a4d0735a6c0183d707ca919bd72f28
+_md5_=c61305101e2402e5454670033480f781
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8fc4be3d01de..6e1640a3ec7e 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2013 12:06:56 +0000
+Thu, 23 May 2013 17:06:58 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index af4e7d5e2fc8..b66ea120a939 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed May 22 12:06:54 UTC 2013
+Thu May 23 17:06:55 UTC 2013
diff --git a/metadata/timestamp.calculate b/metadata/timestamp.calculate
index 1952699bc499..2706030997a2 100644
--- a/metadata/timestamp.calculate
+++ b/metadata/timestamp.calculate
@@ -2267,6 +2267,7 @@
 1303100131 ./sys-kernel/linux-headers/linux-headers-2.4.36.ebuild
 1305150101 ./sys-kernel/linux-headers/linux-headers-3.9.ebuild
 1210101101 ./sys-kernel/linux-headers/linux-headers-3.4.ebuild
+1305230932 ./sys-kernel/pf-sources/pf-sources-3.9.3.ebuild
 1303100131 ./sys-kernel/pf-sources/pf-sources-2.6.33_p4.ebuild
 1303100131 ./sys-kernel/pf-sources/pf-sources-2.6.32_p16.ebuild
 1304080011 ./sys-kernel/pf-sources/pf-sources-3.8.2.ebuild
@@ -3271,9 +3272,9 @@
 1212060901 ./dev-vcs/git-bzr-ng/git-bzr-ng-0_pre20120822.ebuild
 1202110027 ./dev-vcs/git-deploy/git-deploy-20120202.ebuild
 1303170158 ./dev-vcs/tortoisehg/tortoisehg-2.7.1-r1.ebuild
-1305070501 ./dev-vcs/tortoisehg/tortoisehg-9999.ebuild
+1305231801 ./dev-vcs/tortoisehg/tortoisehg-9999.ebuild
 1303081701 ./dev-vcs/tortoisehg/tortoisehg-2.7.1.ebuild
-1305070445 ./dev-vcs/tortoisehg/tortoisehg-2.8.ebuild
+1305231801 ./dev-vcs/tortoisehg/tortoisehg-2.8.ebuild
 1305031146 ./dev-vcs/tortoisehg/tortoisehg-2.7.2.ebuild
 1212020241 ./dev-vcs/pwclient/pwclient-20121105131501.ebuild
 1305110514 ./dev-vcs/svneverever/svneverever-1.2.2.ebuild
@@ -3306,8 +3307,6 @@
 1303030131 ./dev-vcs/svn2git/svn2git-0_pre20100303.ebuild
 1203182001 ./dev-vcs/cvs2cl/cvs2cl-2.71.ebuild
 1203182001 ./dev-vcs/cvs2cl/cvs2cl-2.59.ebuild
-1209302301 ./dev-vcs/bzr-explorer/bzr-explorer-1.2.1.ebuild
-1301302331 ./dev-vcs/bzr-explorer/bzr-explorer-1.2.2.ebuild
 1305201231 ./dev-vcs/bzr-explorer/bzr-explorer-1.3.0.ebuild
 1304171301 ./dev-vcs/mercurial/mercurial-9999.ebuild
 1305151303 ./dev-vcs/mercurial/mercurial-2.6.1.ebuild
@@ -4944,7 +4943,7 @@
 1206031600 ./x11-libs/libdrm/libdrm-2.4.20-r1.ebuild
 1304210033 ./x11-libs/libdrm/libdrm-2.4.44.ebuild
 1303271440 ./x11-libs/libdrm/libdrm-2.4.43.ebuild
-1305160507 ./x11-libs/libdrm/libdrm-2.4.45.ebuild
+1305231931 ./x11-libs/libdrm/libdrm-2.4.45.ebuild
 1301042201 ./x11-libs/libdrm/libdrm-2.4.40.ebuild
 1304210101 ./x11-libs/libdrm/libdrm-2.4.42.ebuild
 1208262301 ./x11-libs/libdrm/libdrm-2.4.33.ebuild
@@ -5165,7 +5164,7 @@
 0705302058 ./x11-misc/xrestop/xrestop-0.4.ebuild
 1302270931 ./x11-misc/menulibre/menulibre-13.01.4.ebuild
 1202050634 ./x11-misc/menumaker/menumaker-0.99.7.ebuild
-1305202347 ./x11-misc/dmenu/dmenu-4.5-r3.ebuild
+1305230731 ./x11-misc/dmenu/dmenu-4.5-r3.ebuild
 1301280702 ./x11-misc/dmenu/dmenu-4.5-r2.ebuild
 1302221812 ./x11-misc/dunst/dunst-0.5.0.ebuild
 1205131252 ./x11-misc/gdevilspie/gdevilspie-0.5.ebuild
@@ -5599,7 +5598,7 @@
 1212301831 ./www-client/elinks/elinks-0.12_pre5-r2.ebuild
 1304211201 ./www-client/netsurf/netsurf-2.9.ebuild
 1305100101 ./www-client/chromium/chromium-9999-r1.ebuild
-1305210518 ./www-client/chromium/chromium-27.0.1453.93.ebuild
+1305222131 ./www-client/chromium/chromium-27.0.1453.93.ebuild
 1304110301 ./www-client/chromium/chromium-26.0.1410.43.ebuild
 1305220140 ./www-client/chromium/chromium-28.0.1500.20.ebuild
 1305140138 ./www-client/chromium/chromium-28.0.1500.11.ebuild
@@ -6043,6 +6042,7 @@
 1302192003 ./sci-libs/mpir/mpir-2.6.0-r1.ebuild
 1208040001 ./sci-libs/mpir/mpir-2.5.1.ebuild
 1105141333 ./sci-libs/mpir/mpir-2.2.1.ebuild
+1305222020 ./sci-libs/mpir/mpir-2.6.0-r2.ebuild
 1302190101 ./sci-libs/mpir/mpir-2.6.0.ebuild
 1305061924 ./sci-libs/nfft/nfft-3.2.3.ebuild
 1302271201 ./sci-libs/ogdi/ogdi-3.1.5-r1.ebuild
@@ -6059,6 +6059,7 @@
 0912060354 ./sci-libs/libgenome/libgenome-1.3-r1.ebuild
 0907211201 ./sci-libs/parmgridgen/parmgridgen-1.0.ebuild
 1303042231 ./sci-libs/ceres-solver/ceres-solver-1.4.0.ebuild
+1305230110 ./sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild
 1206290401 ./sci-libs/colpack/colpack-1.0.6.ebuild
 1209180231 ./sci-libs/colpack/colpack-1.0.8.ebuild
 1212081631 ./sci-libs/suitesparseconfig/suitesparseconfig-4.0.2.ebuild
@@ -6656,7 +6657,7 @@
 1201211323 ./app-admin/eselect-opencl/eselect-opencl-1.1.0.ebuild
 1205161901 ./app-admin/eselect-opencl/eselect-opencl-1.1.0-r1.ebuild
 1208262001 ./app-admin/eselect-opengl/eselect-opengl-1.2.5-r1.ebuild
-1302271001 ./app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild
+1305231931 ./app-admin/eselect-opengl/eselect-opengl-1.2.7.ebuild
 1110032145 ./app-admin/eselect-opengl/eselect-opengl-1.2.4.ebuild
 1212030101 ./app-admin/eselect-opengl/eselect-opengl-1.2.6.1.ebuild
 1206051553 ./app-admin/eselect-opengl/eselect-opengl-1.2.6.ebuild
@@ -7693,6 +7694,7 @@
 1105101350 ./app-emacs/apel/apel-10.8.ebuild
 1304040031 ./app-emacs/elib/elib-1.0-r1.ebuild
 1304040101 ./app-emacs/emms/emms-3.0-r1.ebuild
+1305222029 ./app-emacs/evil/evil-1.0.2.ebuild
 1303072019 ./app-emacs/evil/evil-1.0.1.ebuild
 1105101425 ./app-emacs/flim/flim-1.14.9-r2.ebuild
 1205230131 ./app-emacs/howm/howm-1.3.9.2.ebuild
@@ -8683,6 +8685,7 @@
 1305131901 ./x11-drivers/nvidia-drivers/nvidia-drivers-173.14.37.ebuild
 1305092031 ./x11-drivers/nvidia-drivers/nvidia-drivers-319.17.ebuild
 1305102001 ./x11-drivers/nvidia-drivers/nvidia-drivers-310.51.ebuild
+1305231904 ./x11-drivers/nvidia-drivers/nvidia-drivers-319.23.ebuild
 1305092031 ./x11-drivers/nvidia-drivers/nvidia-drivers-310.44.ebuild
 1305092031 ./x11-drivers/nvidia-drivers/nvidia-drivers-313.30.ebuild
 1110032200 ./x11-drivers/xf86-input-aiptek/xf86-input-aiptek-1.4.1.ebuild
@@ -9153,6 +9156,7 @@
 1104131919 ./app-i18n/rskkserv/rskkserv-2.95.3-r1.ebuild
 1104131919 ./app-i18n/rskkserv/rskkserv-2.95.4.ebuild
 1104131919 ./app-i18n/rskkserv/rskkserv-2.95.4-r1.ebuild
+1305230010 ./app-i18n/transifex-client/transifex-client-0.9.ebuild
 1303040331 ./app-i18n/transifex-client/transifex-client-0.8.0-r1.ebuild
 1304092231 ./app-i18n/cstools/cstools-3.42.ebuild
 1206010431 ./app-i18n/dbskkd-cdb/dbskkd-cdb-2.00.ebuild
@@ -9371,6 +9375,7 @@
 1302051511 ./app-i18n/ibus-rime/ibus-rime-0.9.8.ebuild
 1202071231 ./app-misc/bb/bb-1.3.0_rc1-r2.ebuild
 1108131127 ./app-misc/cw/cw-1.0.16-r2.ebuild
+1305231036 ./app-misc/jq/jq-1.3.ebuild
 1305011501 ./app-misc/jq/jq-1.2.ebuild
 1301111538 ./app-misc/mc/mc-4.8.7-r1.ebuild
 1304032237 ./app-misc/mc/mc-4.8.8.ebuild
@@ -9676,6 +9681,7 @@
 1204252031 ./app-misc/ddccontrol/ddccontrol-0.4.1.ebuild
 1305021442 ./app-misc/hddled/hddled-0.3.ebuild
 1304231301 ./app-misc/gramps/gramps-3.4.3.ebuild
+1305230144 ./app-misc/gramps/gramps-3.4.5.ebuild
 1305160750 ./app-misc/gramps/gramps-3.4.4.ebuild
 1101051828 ./app-misc/hilite/hilite-1.5.ebuild
 1102021454 ./app-misc/irtrans-irclient/irtrans-irclient-6.01.05.ebuild
@@ -9979,7 +9985,7 @@
 1305022031 ./app-text/xournal/xournal-9999.ebuild
 1212201531 ./app-text/libexttextcat/libexttextcat-3.4.0.ebuild
 1207311831 ./app-text/libexttextcat/libexttextcat-3.3.1.ebuild
-1305071638 ./app-text/libodfgen/libodfgen-0.0.1.ebuild
+1305231443 ./app-text/libodfgen/libodfgen-0.0.2.ebuild
 1205040801 ./app-text/notecase/notecase-1.9.8.ebuild
 1101051211 ./app-text/unix2dos/unix2dos-2.2-r1.ebuild
 1012281834 ./app-text/adiff/adiff-1.4.ebuild
@@ -10037,7 +10043,7 @@
 1303030001 ./app-text/sigil/sigil-0.6.0.ebuild
 1303030001 ./app-text/sigil/sigil-0.6.2.ebuild
 1209051131 ./app-text/tkman/tkman-2.2-r1.ebuild
-1302150201 ./app-text/sword/sword-1.6.2.ebuild
+1305231831 ./app-text/sword/sword-1.6.2.ebuild
 1005240014 ./app-text/trang/trang-20091111.ebuild
 1112200816 ./app-text/unrtf/unrtf-0.21.2.ebuild
 0909070045 ./app-text/unrtf/unrtf-0.20.1.ebuild
@@ -10350,7 +10356,7 @@
 0909232035 ./app-text/htmlinc/htmlinc-1.0_beta1.ebuild
 1303030001 ./app-text/ansifilter/ansifilter-1.7.ebuild
 1006121622 ./app-text/bibclean/bibclean-2.11.4.ebuild
-1304111800 ./app-text/pastebinit/pastebinit-1.3.1-r1.ebuild
+1305231601 ./app-text/pastebinit/pastebinit-1.3.1-r1.ebuild
 1305190331 ./app-text/calibre/calibre-0.9.30.ebuild
 1305190331 ./app-text/calibre/calibre-0.9.31.ebuild
 1305190331 ./app-text/calibre/calibre-0.9.27.ebuild
@@ -10383,7 +10389,7 @@
 1211260131 ./app-text/chm2pdf/chm2pdf-0.9.1-r1.ebuild
 1007102325 ./app-text/docbook-sgml/docbook-sgml-1.0.ebuild
 1303250831 ./app-text/qpdfview/qpdfview-0.4.ebuild
-1305211505 ./app-text/qpdfview/qpdfview-0.4.2-r1.ebuild
+1305231231 ./app-text/qpdfview/qpdfview-0.4.2-r1.ebuild
 1303172031 ./app-text/qpdfview/qpdfview-0.3.7-r2.ebuild
 1303030001 ./app-text/qpdfview/qpdfview-0.3.4.ebuild
 1305202201 ./app-text/qpdfview/qpdfview-0.4.2.ebuild
@@ -12426,6 +12432,7 @@
 1211151931 ./kde-misc/rsibreak/rsibreak-0.11.ebuild
 1305201701 ./kde-misc/yakuake/yakuake-2.9.9-r2.ebuild
 1207211801 ./kde-misc/kio-upnp-ms/kio-upnp-ms-1.0.0_p20110602.ebuild
+1305222217 ./kde-misc/akonadi-git-resource/akonadi-git-resource-0_p20130522.ebuild
 1202222027 ./kde-misc/akonadi-git-resource/akonadi-git-resource-0_p20120222.ebuild
 1206220616 ./kde-misc/kio-slp/kio-slp-0_p20120621.ebuild
 1205012205 ./kde-misc/kbiff/kbiff-4.0.ebuild
@@ -12647,7 +12654,6 @@
 1302180101 ./mail-client/mailx-support/mailx-support-20060102-r1.ebuild
 1305071214 ./mail-client/trojita/trojita-0.3.93.ebuild
 1305071231 ./mail-client/trojita/trojita-9999.ebuild
-1210171801 ./mail-client/sylpheed/sylpheed-3.2.0.ebuild
 1304122131 ./mail-client/sylpheed/sylpheed-3.3.0.ebuild
 1305080831 ./mail-client/claws-mail-python/claws-mail-python-0.11.ebuild
 1305080801 ./mail-client/claws-mail-pdf-viewer/claws-mail-pdf-viewer-0.9.3.ebuild
@@ -12660,6 +12666,7 @@
 1304112331 ./mail-client/evolution/evolution-3.6.4.ebuild
 1305122019 ./mail-client/evolution/evolution-3.8.2.ebuild
 1303031901 ./mail-client/evolution/evolution-2.32.3-r1.ebuild
+1305230147 ./mail-client/clawsker/clawsker-0.7.10.ebuild
 1210312301 ./mail-client/clawsker/clawsker-0.7.8.ebuild
 1303300131 ./mail-client/postler/postler-0.1.1.ebuild
 1304021631 ./mail-client/roundcube/roundcube-0.8.6.ebuild
@@ -12904,7 +12911,7 @@
 1303140039 ./media-gfx/ufraw/ufraw-0.19.1.ebuild
 1303031531 ./media-gfx/ufraw/ufraw-0.19.ebuild
 1303031531 ./media-gfx/ufraw/ufraw-0.18.ebuild
-1305221501 ./media-gfx/ufraw/ufraw-0.19.2.ebuild
+1305231001 ./media-gfx/ufraw/ufraw-0.19.2.ebuild
 1303030201 ./media-gfx/wally/wally-2.4.4.ebuild
 0912112253 ./media-gfx/wings/wings-1.1.1.ebuild
 1204270131 ./media-gfx/ebdftopcf/ebdftopcf-2.ebuild
@@ -13214,7 +13221,7 @@
 1301041727 ./net-dns/knot/knot-1.1.3.ebuild
 1304032134 ./net-dns/knot/knot-1.2.0.ebuild
 1211252031 ./net-dns/pdns/pdns-3.0.1.ebuild
-1305202305 ./net-dns/pdns/pdns-3.2.ebuild
+1305231631 ./net-dns/pdns/pdns-3.2.ebuild
 1211252031 ./net-dns/pdns/pdns-3.1.ebuild
 1304150101 ./net-dns/totd/totd-1.5.1.ebuild
 1303030301 ./net-dns/dnssec-system-tray/dnssec-system-tray-1.13.ebuild
@@ -13321,6 +13328,7 @@
 1207292131 ./net-ftp/frox/frox-0.7.18-r2.ebuild
 1207292131 ./net-ftp/frox/frox-0.7.18-r4.ebuild
 1304241831 ./net-ftp/lftp/lftp-4.4.5.ebuild
+1305231911 ./net-ftp/lftp/lftp-4.4.7.ebuild
 1305171741 ./net-ftp/lftp/lftp-4.4.6.ebuild
 0510041332 ./net-ftp/weex/weex-2.6.1.5-r1.ebuild
 1104291913 ./net-ftp/yafc/yafc-1.1.2.ebuild
@@ -13484,6 +13492,7 @@
 0903090722 ./net-irc/dircproxy/dircproxy-1.1.0-r2.ebuild
 0906061858 ./net-irc/ptlink-ircd/ptlink-ircd-6.19.6-r1.ebuild
 1305141401 ./net-irc/weechat/weechat-9999.ebuild
+1305231531 ./net-irc/weechat/weechat-0.4.1.ebuild
 1304051501 ./net-irc/weechat/weechat-0.4.0.ebuild
 1012030340 ./net-irc/bobotpp/bobotpp-2.2.2.ebuild
 1202062131 ./net-irc/bobotpp/bobotpp-2.2.3.ebuild
@@ -13773,10 +13782,11 @@
 1303200450 ./media-libs/mesa/mesa-9.1.1.ebuild
 1305152205 ./media-libs/mesa/mesa-9.2_pre20130515.ebuild
 1305100031 ./media-libs/mesa/mesa-7.10.3.ebuild
+1305230429 ./media-libs/mesa/mesa-9.1.3.ebuild
 1303191731 ./media-libs/mesa/mesa-9.1.ebuild
 1305100031 ./media-libs/mesa/mesa-9.0.2.ebuild
 1305062001 ./media-libs/mesa/mesa-9.1.2.ebuild
-1305141931 ./media-libs/mesa/mesa-9.1.2-r1.ebuild
+1305231931 ./media-libs/mesa/mesa-9.1.2-r1.ebuild
 1305032301 ./media-libs/ming/ming-0.4.4.ebuild
 1301121707 ./media-libs/opus/opus-1.0.2.ebuild
 1305081250 ./media-libs/opus/opus-1.0.2-r2.ebuild
@@ -14152,7 +14162,7 @@
 1302041201 ./media-libs/libXcm/libXcm-0.5.2.ebuild
 1301151731 ./media-libs/libass/libass-0.10.1.ebuild
 1205051231 ./media-libs/libass/libass-0.9.13.ebuild
-1305171831 ./media-libs/libcdr/libcdr-0.0.14.ebuild
+1305221931 ./media-libs/libcdr/libcdr-0.0.14.ebuild
 1304221831 ./media-libs/libcdr/libcdr-9999.ebuild
 1304291731 ./media-libs/libcdr/libcdr-0.0.13.ebuild
 1106231519 ./media-libs/libbsb/libbsb-0.0.7.ebuild
@@ -15184,7 +15194,7 @@
 1107120045 ./sys-apps/cracklib-words/cracklib-words-20080507.ebuild
 1303292101 ./sys-apps/gptfdisk/gptfdisk-0.8.5.ebuild
 1303292101 ./sys-apps/gptfdisk/gptfdisk-0.8.4.ebuild
-1305130031 ./sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
+1305230201 ./sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
 1003212219 ./sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.6.ebuild
 1001181753 ./sys-apps/ibm-powerpc-utils-papr/ibm-powerpc-utils-papr-1.1.0.ebuild
 1212111401 ./sys-apps/biosdevname/biosdevname-0.4.0.ebuild
@@ -15219,6 +15229,7 @@
 1211140001 ./sys-apps/groff/groff-1.21-r1.ebuild
 0908160838 ./sys-apps/groff/groff-1.20.1-r1.ebuild
 1303070031 ./sys-apps/hwids/hwids-20130302.ebuild
+1305231835 ./sys-apps/hwids/hwids-20130523.ebuild
 1305150235 ./sys-apps/hwids/hwids-20130514.ebuild
 1304140101 ./sys-apps/hwids/hwids-20130329.ebuild
 1303102101 ./sys-apps/hwids/hwids-99999999.ebuild
@@ -15227,7 +15238,7 @@
 1302181048 ./sys-apps/hwloc/hwloc-1.4.2.ebuild
 1210072125 ./sys-apps/hwloc/hwloc-1.5.ebuild
 1202250801 ./sys-apps/kudzu/kudzu-1.2.83-r1.ebuild
-1302092259 ./sys-apps/lnxhc/lnxhc-1.2.ebuild
+1305230117 ./sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
 0911302314 ./sys-apps/lsadb/lsadb-0.1.3.ebuild
 1207012044 ./sys-apps/mtree/mtree-1.0.ebuild
 1301280331 ./sys-apps/prctl/prctl-1.5.ebuild
@@ -15239,6 +15250,7 @@
 1201150412 ./sys-apps/unscd/unscd-0.48.ebuild
 1002160241 ./sys-apps/unscd/unscd-0.39.ebuild
 1002160241 ./sys-apps/unscd/unscd-0.45.ebuild
+1305230714 ./sys-apps/which/which-2.20-r1.ebuild
 0803291828 ./sys-apps/which/which-2.19.ebuild
 1302180031 ./sys-apps/which/which-2.20.ebuild
 1301170049 ./sys-apps/pcsc-lite/pcsc-lite-1.8.8.ebuild
@@ -16375,14 +16387,11 @@
 1007170201 ./app-emulation/virt-what/virt-what-1.2.ebuild
 1303161931 ./app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20130224.ebuild
 1212252331 ./app-emulation/emul-linux-x86-cpplibs/emul-linux-x86-cpplibs-20121202.ebuild
-1305220401 ./app-emulation/libvirt/libvirt-1.0.4.ebuild
-1305220401 ./app-emulation/libvirt/libvirt-1.0.5.1.ebuild
-1305120601 ./app-emulation/libvirt/libvirt-9999.ebuild
-1305220401 ./app-emulation/libvirt/libvirt-1.0.3-r2.ebuild
-1305220401 ./app-emulation/libvirt/libvirt-1.0.5.ebuild
-1305220401 ./app-emulation/libvirt/libvirt-1.0.0.ebuild
+1305222001 ./app-emulation/libvirt/libvirt-1.0.4.ebuild
+1305222001 ./app-emulation/libvirt/libvirt-1.0.5.1.ebuild
+1305222001 ./app-emulation/libvirt/libvirt-9999.ebuild
+1305222001 ./app-emulation/libvirt/libvirt-1.0.3-r2.ebuild
 1305220401 ./app-emulation/libvirt/libvirt-1.0.2-r2.ebuild
-1305220401 ./app-emulation/libvirt/libvirt-1.0.3-r1.ebuild
 1304271331 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.2.12.ebuild
 1302141731 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.24.ebuild
 1304140035 ./app-emulation/virtualbox-guest-additions/virtualbox-guest-additions-4.1.26.ebuild
@@ -16522,7 +16531,7 @@
 1302200031 ./app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r1.ebuild
 1302192331 ./app-emulation/xen-pvgrub/xen-pvgrub-4.2.0-r1.ebuild
 1305201815 ./app-emulation/xen-pvgrub/xen-pvgrub-4.2.2.ebuild
-1305201815 ./app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild
+1305231601 ./app-emulation/xen-pvgrub/xen-pvgrub-4.2.1-r2.ebuild
 1301301831 ./app-emulation/xen-pvgrub/xen-pvgrub-4.2.1.ebuild
 1303022331 ./app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20121202.ebuild
 1303161931 ./app-emulation/emul-linux-x86-qtlibs/emul-linux-x86-qtlibs-20130224.ebuild
@@ -16724,7 +16733,7 @@
 1305051731 ./sci-chemistry/mosflm/mosflm-7.0.9.ebuild
 1305051731 ./sci-chemistry/mosflm/mosflm-7.0.6-r2.ebuild
 1204141401 ./sci-chemistry/mrbump/mrbump-0.4.4.ebuild
-1305211458 ./sci-chemistry/numbat/numbat-0.999.ebuild
+1305221840 ./sci-chemistry/numbat/numbat-0.999-r1.ebuild
 1302272101 ./sci-chemistry/ambertools/ambertools-1.5-r1.ebuild
 1304112231 ./sci-chemistry/pdbcat/pdbcat-1.3.ebuild
 1203012012 ./sci-chemistry/pdbcns/pdbcns-2.0.010504.ebuild
@@ -16829,9 +16838,9 @@
 1207011831 ./sys-cluster/charm/charm-6.2.0.ebuild
 1110052240 ./sys-cluster/charm/charm-5.9.ebuild
 1202152331 ./sys-cluster/charm/charm-6.1.2-r2.ebuild
-1305171413 ./sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild
 1301181315 ./sys-cluster/crmsh/crmsh-1.2.4.ebuild
 1211142131 ./sys-cluster/crmsh/crmsh-1.2.1.ebuild
+1305231358 ./sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild
 1103241631 ./sys-cluster/dlm-lib/dlm-lib-2.03.11.ebuild
 1103241631 ./sys-cluster/dlm-lib/dlm-lib-2.03.09.ebuild
 1303082154 ./sys-cluster/libqb/libqb-0.14.4.ebuild
@@ -17063,6 +17072,7 @@
 1304220101 ./net-im/skype/skype-4.0.0.8-r1.ebuild
 1304220101 ./net-im/skype/skype-2.2.0.35-r99.ebuild
 1304220101 ./net-im/skype/skype-4.1.0.20.ebuild
+1305231236 ./net-im/skype/skype-4.2.0.11.ebuild
 1305212345 ./net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-0.6.2.ebuild
 1304210004 ./net-im/ktp-filetransfer-handler/ktp-filetransfer-handler-0.6.1.ebuild
 1303030301 ./net-im/qutecom/qutecom-2.2_p20110210.ebuild
@@ -17438,7 +17448,7 @@
 1205050701 ./net-libs/librpcsecgss/librpcsecgss-0.16.ebuild
 1205050701 ./net-libs/librpcsecgss/librpcsecgss-0.19-r1.ebuild
 1112222210 ./net-libs/ftplib/ftplib-3.1.1.ebuild
-1305221410 ./net-libs/gnutls/gnutls-3.2.0.ebuild
+1305222301 ./net-libs/gnutls/gnutls-3.2.0.ebuild
 1305221410 ./net-libs/gnutls/gnutls-3.1.11.ebuild
 1305221431 ./net-libs/gnutls/gnutls-3.1.10.ebuild
 1303102031 ./net-libs/gnutls/gnutls-2.12.23.ebuild
@@ -17541,7 +17551,8 @@
 0909232249 ./net-libs/libident/libident-0.22.ebuild
 1303231901 ./net-libs/libiscsi/libiscsi-1.9.0.ebuild
 1303231901 ./net-libs/libiscsi/libiscsi-9999.ebuild
-1304030101 ./net-libs/libkgapi/libkgapi-0.4.4.ebuild
+1305230002 ./net-libs/libkgapi/libkgapi-2.0.0.ebuild
+1305230031 ./net-libs/libkgapi/libkgapi-0.4.4.ebuild
 1305051431 ./net-libs/libkolab/libkolab-0.4.1.ebuild
 1302030331 ./net-libs/liboauth/liboauth-0.9.7.ebuild
 1305081931 ./net-libs/liboauth/liboauth-1.0.1.ebuild
@@ -17694,6 +17705,7 @@
 1303232131 ./net-mail/libdbx/libdbx-1.0.3.ebuild
 1303261601 ./net-mail/libpst/libpst-0.6.58.ebuild
 1211210101 ./net-mail/libpst/libpst-0.6.55.ebuild
+1305231006 ./net-mail/libpst/libpst-0.6.59.ebuild
 1111260335 ./net-mail/kuvert/kuvert-2.0.4.ebuild
 1202062201 ./net-mail/mairix/mairix-0.23.ebuild
 1001141822 ./net-mail/qmail-notify/qmail-notify-0.93-r1.ebuild
@@ -18326,6 +18338,7 @@
 1303252101 ./net-misc/sparkleshare/sparkleshare-1.0.0.ebuild
 1304092001 ./net-misc/openvswitch/openvswitch-1.9.0.ebuild
 1305141831 ./net-misc/apt-cacher-ng/apt-cacher-ng-0.7.11.ebuild
+1305221823 ./net-misc/apt-cacher-ng/apt-cacher-ng-0.7.13.ebuild
 1305141831 ./net-misc/apt-cacher-ng/apt-cacher-ng-0.7.12.ebuild
 1208231405 ./net-misc/libss7/libss7-1.0.2.ebuild
 1211212301 ./net-misc/linux-eoip/linux-eoip-0.5.ebuild
@@ -18407,10 +18420,9 @@
 0802031843 ./net-misc/urlview/urlview-0.9.ebuild
 1209282301 ./net-misc/vncrec/vncrec-0.2-r1.ebuild
 1302281532 ./net-misc/balance/balance-3.54-r1.ebuild
-1305211820 ./net-misc/rabbitmq-server/rabbitmq-server-3.1.1.ebuild
+1305221931 ./net-misc/rabbitmq-server/rabbitmq-server-3.1.1.ebuild
 1301111905 ./net-misc/rabbitmq-server/rabbitmq-server-2.8.7.ebuild
 1302121918 ./net-misc/rabbitmq-server/rabbitmq-server-3.0.2.ebuild
-1305211131 ./net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild
 1303152042 ./net-misc/rabbitmq-server/rabbitmq-server-3.0.4.ebuild
 1303030331 ./net-misc/vidalia/vidalia-0.2.21.ebuild
 1303030331 ./net-misc/vidalia/vidalia-0.2.12.ebuild
@@ -19316,6 +19328,7 @@
 1305151144 ./x11-wm/mutter/mutter-3.8.2.ebuild
 1305111201 ./x11-wm/notion/notion-9999.ebuild
 1305111201 ./x11-wm/notion/notion-3_p2013030200.ebuild
+1305230200 ./x11-wm/goomwwm/goomwwm-1.0.0.ebuild
 1205041301 ./x11-wm/selectwm/selectwm-0.4.1.ebuild
 1301101441 ./x11-wm/windowmaker/windowmaker-0.95.4.ebuild
 1304101342 ./x11-wm/windowmaker/windowmaker-0.95.4-r1.ebuild
@@ -19809,6 +19822,7 @@
 1112311759 ./dev-java/lucene-analyzers/lucene-analyzers-1.9.1-r1.ebuild
 1112311759 ./dev-java/lucene-analyzers/lucene-analyzers-2.3.2.ebuild
 1001032359 ./dev-java/jfreechart/jfreechart-1.0.13.ebuild
+1305221710 ./dev-java/jfreechart/jfreechart-1.0.14.ebuild
 0909120213 ./dev-java/xml-im-exporter/xml-im-exporter-1.1-r1.ebuild
 1207091801 ./dev-java/glassfish-persistence/glassfish-persistence-1.0-r1.ebuild
 1304100031 ./dev-java/icedtea-bin/icedtea-bin-7.2.3.8.ebuild
@@ -20235,6 +20249,7 @@
 0806162305 ./dev-java/sun-j2ee-deployment-bin/sun-j2ee-deployment-bin-1.1-r2.ebuild
 1110092101 ./dev-java/appframework/appframework-1.03-r2.ebuild
 1303141505 ./dev-java/icedtea/icedtea-7.2.3.8.ebuild
+1305230945 ./dev-java/icedtea/icedtea-6.1.12.5.ebuild
 1303141505 ./dev-java/icedtea/icedtea-6.1.12.4.ebuild
 1112312046 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-1.2.ebuild
 1112312046 ./dev-java/xmlgraphics-commons/xmlgraphics-commons-1.3.1.ebuild
@@ -20499,6 +20514,7 @@
 1304101131 ./dev-lang/R/R-3.0.0.ebuild
 1303050256 ./dev-lang/R/R-2.15.3.ebuild
 1302190001 ./dev-lang/R/R-2.15.2-r2.ebuild
+1305231858 ./dev-lang/R/R-3.0.1.ebuild
 1302191701 ./dev-lang/R/R-2.15.2.ebuild
 1211260756 ./dev-lang/j/j-701-r1.ebuild
 1305202101 ./dev-lang/go/go-9999.ebuild
@@ -21133,9 +21149,9 @@
 1305182331 ./dev-libs/folks/folks-0.9.1.ebuild
 1205071145 ./dev-libs/folks/folks-0.6.9.ebuild
 1302030231 ./dev-libs/folks/folks-0.8.0.ebuild
-1305221501 ./dev-libs/geoip/geoip-1.5.0.ebuild
+1305222231 ./dev-libs/geoip/geoip-1.5.0.ebuild
 1304032231 ./dev-libs/geoip/geoip-1.4.8-r3.ebuild
-1305201926 ./dev-libs/geoip/geoip-1.5.0-r1.ebuild
+1305222231 ./dev-libs/geoip/geoip-1.5.0-r1.ebuild
 1303241741 ./dev-libs/gmime/gmime-2.6.15.ebuild
 1210282001 ./dev-libs/gmime/gmime-2.6.10.ebuild
 1211242246 ./dev-libs/gmime/gmime-2.4.33.ebuild
@@ -21160,14 +21176,10 @@
 1205122331 ./dev-libs/libev/libev-4.11.ebuild
 1108291037 ./dev-libs/libev/libev-4.04.ebuild
 1303071727 ./dev-libs/libev/libev-4.15.ebuild
-1305212101 ./dev-libs/libnl/libnl-3.2.19.ebuild
 1305212101 ./dev-libs/libnl/libnl-3.2.14.ebuild
 1305212101 ./dev-libs/libnl/libnl-1.1.4.ebuild
-1305212101 ./dev-libs/libnl/libnl-3.2.20.ebuild
-1305212101 ./dev-libs/libnl/libnl-3.2.16.ebuild
 1305212101 ./dev-libs/libnl/libnl-1.1-r3.ebuild
 1305212101 ./dev-libs/libnl/libnl-3.2.22.ebuild
-1305212101 ./dev-libs/libnl/libnl-3.2.18.ebuild
 1305212101 ./dev-libs/libnl/libnl-1.1.3.ebuild
 1305212101 ./dev-libs/libnl/libnl-3.2.21.ebuild
 1205042301 ./dev-libs/libxr/libxr-1.0.ebuild
@@ -23500,7 +23512,6 @@
 1301150931 ./dev-ruby/bcat/bcat-0.6.2.ebuild
 1206172101 ./dev-ruby/amqp/amqp-0.6.7-r1.ebuild
 1210181104 ./dev-ruby/amqp/amqp-0.9.8.ebuild
-1207291104 ./dev-ruby/amqp/amqp-0.9.7.ebuild
 1301150701 ./dev-ruby/arel/arel-3.0.2-r1.ebuild
 1301150701 ./dev-ruby/arel/arel-2.2.3.ebuild
 1205121031 ./dev-ruby/bson/bson-1.6.2.ebuild
@@ -23703,12 +23714,10 @@
 1212232131 ./dev-ruby/net-ssh-gateway/net-ssh-gateway-1.1.0-r1.ebuild
 1102201715 ./dev-ruby/async_sinatra/async_sinatra-0.4.0.ebuild
 1212142008 ./dev-ruby/async_sinatra/async_sinatra-1.0.0.ebuild
-1301151131 ./dev-ruby/mocha/mocha-0.10.5.ebuild
-1301151131 ./dev-ruby/mocha/mocha-0.13.1.ebuild
-1304082146 ./dev-ruby/mocha/mocha-0.13.3.ebuild
-1301151131 ./dev-ruby/mocha/mocha-0.11.4.ebuild
-1301151131 ./dev-ruby/mocha/mocha-0.12.7.ebuild
-1301151131 ./dev-ruby/mocha/mocha-0.13.0.ebuild
+1305222201 ./dev-ruby/mocha/mocha-0.10.5.ebuild
+1305222201 ./dev-ruby/mocha/mocha-0.13.3.ebuild
+1305222201 ./dev-ruby/mocha/mocha-0.11.4.ebuild
+1305222201 ./dev-ruby/mocha/mocha-0.12.7.ebuild
 1205110831 ./dev-ruby/mongo/mongo-1.6.2.ebuild
 1208041831 ./dev-ruby/oauth/oauth-0.4.6.ebuild
 1210051433 ./dev-ruby/oauth/oauth-0.4.7.ebuild
@@ -23860,6 +23869,7 @@
 1209161401 ./dev-ruby/ruby-password/ruby-password-0.5.3-r1.ebuild
 1212141126 ./dev-ruby/amq-client/amq-client-0.9.10.ebuild
 1304271106 ./dev-ruby/amq-client/amq-client-0.9.12.ebuild
+1305230849 ./dev-ruby/amq-client/amq-client-1.0.2.ebuild
 1205012231 ./dev-ruby/gettext_activerecord/gettext_activerecord-2.1.0-r1.ebuild
 1301160531 ./dev-ruby/sinatra/sinatra-1.2.7.ebuild
 1301160531 ./dev-ruby/sinatra/sinatra-1.3.2.ebuild
@@ -23986,6 +23996,7 @@
 1206190841 ./dev-ruby/calendar_date_select/calendar_date_select-1.16.4.ebuild
 1212141944 ./dev-ruby/amq-protocol/amq-protocol-1.0.1.ebuild
 1304271522 ./dev-ruby/amq-protocol/amq-protocol-1.3.0.ebuild
+1305230845 ./dev-ruby/amq-protocol/amq-protocol-1.6.0.ebuild
 1302231248 ./dev-ruby/amq-protocol/amq-protocol-1.2.0.ebuild
 1301151101 ./dev-ruby/abstract/abstract-1.0.0.ebuild
 1301151101 ./dev-ruby/abstract/abstract-1.0.0-r1.ebuild
@@ -24378,7 +24389,7 @@
 1201221526 ./dev-ruby/date_validator/date_validator-0.6.3.ebuild
 1210282131 ./dev-ruby/redcloth/redcloth-4.2.3-r1.ebuild
 1301151031 ./dev-ruby/redcloth/redcloth-4.2.9.ebuild
-1305212231 ./dev-ruby/transaction-simple/transaction-simple-1.4.0.2.ebuild
+1305231531 ./dev-ruby/transaction-simple/transaction-simple-1.4.0.2.ebuild
 1205012231 ./dev-ruby/transaction-simple/transaction-simple-1.4.0-r1.ebuild
 1302231134 ./dev-ruby/deep_merge/deep_merge-1.0.0.ebuild
 1302021500 ./dev-ruby/chronic/chronic-0.9.0.ebuild
@@ -24533,11 +24544,11 @@
 1006300320 ./dev-util/eggy/eggy-0.3.3.ebuild
 1004041141 ./dev-util/duma/duma-2.5.15-r1.ebuild
 0909232144 ./dev-util/duma/duma-2.5.13.ebuild
-1305221231 ./dev-util/eric/eric-4.5.10.ebuild
+1305231601 ./dev-util/eric/eric-4.5.10.ebuild
 1305221349 ./dev-util/eric/eric-5.3.3.ebuild
 1302181531 ./dev-util/eric/eric-5.2.7.ebuild
 1302181531 ./dev-util/eric/eric-4.5.8.ebuild
-1304080349 ./dev-util/eric/eric-5.3.2.ebuild
+1305231601 ./dev-util/eric/eric-5.3.2.ebuild
 1104201650 ./dev-util/fuzz/fuzz-0.6.ebuild
 1305201301 ./dev-util/jedi/jedi-0.5_beta5.ebuild
 1305152129 ./dev-util/jedi/jedi-0.6.0.ebuild
@@ -24925,6 +24936,7 @@
 1305051758 ./dev-util/debootstrap/debootstrap-1.0.49.ebuild
 1305181842 ./dev-util/debootstrap/debootstrap-1.0.50.ebuild
 1303051331 ./dev-util/debootstrap/debootstrap-1.0.46.ebuild
+1305230718 ./dev-util/debootstrap/debootstrap-1.0.52.ebuild
 1304062022 ./dev-util/debootstrap/debootstrap-1.0.48.ebuild
 1212021731 ./dev-util/gquilt/gquilt-0.25.ebuild
 1212112031 ./dev-util/sysprof/sysprof-1.2.0.ebuild
@@ -25155,6 +25167,7 @@
 1203182331 ./dev-python/py/py-1.4.5.ebuild
 1211131430 ./dev-python/py/py-1.4.12.ebuild
 1206172301 ./dev-python/py/py-1.4.7.ebuild
+1305230910 ./dev-python/py/py-1.4.14.ebuild
 1303282331 ./dev-python/sh/sh-1.07.ebuild
 1303282313 ./dev-python/sh/sh-1.08.ebuild
 1304242307 ./dev-python/vo/vo-0.8-r1.ebuild
@@ -25175,7 +25188,7 @@
 1007240336 ./dev-python/orm/orm-1.0.1.ebuild
 1305040001 ./dev-python/pip/pip-1.2.1.ebuild
 1305040001 ./dev-python/pip/pip-1.3.1.ebuild
-1305220631 ./dev-python/ply/ply-3.4.ebuild
+1305231231 ./dev-python/ply/ply-3.4.ebuild
 1305220631 ./dev-python/ply/ply-3.4-r1.ebuild
 1305100901 ./dev-python/pmw/pmw-2.0.0.ebuild
 1301291701 ./dev-python/pmw/pmw-1.3.2-r2.ebuild
@@ -25295,12 +25308,12 @@
 1303212135 ./dev-python/milk/milk-0.5.1.ebuild
 1007040246 ./dev-python/lupy/lupy-0.2.1-r1.ebuild
 1304121107 ./dev-python/lxml/lxml-3.1.2.ebuild
-1305050101 ./dev-python/lxml/lxml-3.2.0.ebuild
+1305230201 ./dev-python/lxml/lxml-3.2.0.ebuild
 1302030201 ./dev-python/lxml/lxml-3.0.1.ebuild
 1210132301 ./dev-python/lxml/lxml-2.3.5.ebuild
 1304070440 ./dev-python/lxml/lxml-3.1.1.ebuild
 1212271501 ./dev-python/lxml/lxml-2.3.4.ebuild
-1305150239 ./dev-python/lxml/lxml-3.2.1.ebuild
+1305230231 ./dev-python/lxml/lxml-3.2.1.ebuild
 1210132301 ./dev-python/lxml/lxml-2.3.6.ebuild
 1302130730 ./dev-python/lxml/lxml-3.1.0.ebuild
 1301062301 ./dev-python/mock/mock-0.7.2.ebuild
@@ -25365,6 +25378,7 @@
 1204210001 ./dev-python/xlrd/xlrd-0.7.7.ebuild
 1302181531 ./dev-python/xlrd/xlrd-0.8.0.ebuild
 1305201231 ./dev-python/xlrd/xlrd-0.9.0.ebuild
+1305230812 ./dev-python/xlrd/xlrd-0.9.2.ebuild
 1305161731 ./dev-python/xlwt/xlwt-0.7.4-r1.ebuild
 1305201701 ./dev-python/xlwt/xlwt-0.7.5.ebuild
 1010310131 ./dev-python/xlwt/xlwt-0.7.2.ebuild
@@ -25475,7 +25489,7 @@
 1301211001 ./dev-python/django-pipeline/django-pipeline-1.2.9.ebuild
 1305171737 ./dev-python/django-pipeline/django-pipeline-1.2.24.ebuild
 1301211001 ./dev-python/django-pipeline/django-pipeline-1.2.6.ebuild
-1305202101 ./dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
+1305222031 ./dev-python/django-pipeline/django-pipeline-1.3.9.ebuild
 1205041931 ./dev-python/pyorbit/pyorbit-2.24.0.ebuild
 1303290231 ./dev-python/pypgsql/pypgsql-2.5.1-r1.ebuild
 1202231431 ./dev-python/pypgsql/pypgsql-2.5.1.ebuild
@@ -25587,8 +25601,9 @@
 1207040501 ./dev-python/SchemaObject/SchemaObject-0.5.3.ebuild
 1110082137 ./dev-python/flask/flask-0.7.2.ebuild
 1102122045 ./dev-python/flask/flask-0.6.1.ebuild
-1303280731 ./dev-python/flask/flask-9999.ebuild
+1305230501 ./dev-python/flask/flask-9999.ebuild
 1208202131 ./dev-python/flask/flask-0.9.ebuild
+1305230432 ./dev-python/flask/flask-0.9-r2.ebuild
 1110082313 ./dev-python/flask/flask-0.8.ebuild
 1303280718 ./dev-python/flask/flask-0.9-r1.ebuild
 1303271631 ./dev-python/eyeD3/eyeD3-0.7.1.ebuild
@@ -25624,11 +25639,13 @@
 1210281524 ./dev-python/ijson/ijson-1.0.ebuild
 1301061309 ./dev-python/ijson/ijson-1.0-r1.ebuild
 1010250651 ./dev-python/jaxml/jaxml-3.02.ebuild
+1305230531 ./dev-python/jinja/jinja-2.6-r100.ebuild
 1302030231 ./dev-python/jinja/jinja-2.6-r1.ebuild
-1305201851 ./dev-python/jinja/jinja-2.7.ebuild
-1304282014 ./dev-python/jinja/jinja-2.6-r2.ebuild
+1305231731 ./dev-python/jinja/jinja-2.7.ebuild
+1305230531 ./dev-python/jinja/jinja-2.6-r2.ebuild
 1205090431 ./dev-python/jinja/jinja-2.6.ebuild
 1212010631 ./dev-python/jonpy/jonpy-0.10.ebuild
+1305222000 ./dev-python/jsmin/jsmin-2.0.3.ebuild
 1212181940 ./dev-python/larch/larch-1.20121216.ebuild
 1210070440 ./dev-python/larch/larch-1.20121006-r1.ebuild
 1303241618 ./dev-python/larch/larch-1.20130316.ebuild
@@ -25834,7 +25851,7 @@
 1301211323 ./dev-python/nosehtmloutput/nosehtmloutput-0.0.4.ebuild
 1208030201 ./dev-python/html5lib/html5lib-0.95.ebuild
 1208030201 ./dev-python/html5lib/html5lib-0.90.ebuild
-1304241231 ./dev-python/html5lib/html5lib-0.95-r1.ebuild
+1305222031 ./dev-python/html5lib/html5lib-0.95-r1.ebuild
 1302211731 ./dev-python/editobj/editobj-0.5.7-r1.ebuild
 1012261841 ./dev-python/reverend/reverend-0.4.ebuild
 1208111701 ./dev-python/nautilus-python/nautilus-python-1.1-r1.ebuild
@@ -25988,6 +26005,7 @@
 1304051601 ./dev-python/django-evolution/django-evolution-0.6.7-r1.ebuild
 1305221136 ./dev-python/django-evolution/django-evolution-0.6.9.ebuild
 1205150520 ./dev-python/embedly/embedly-0.4.3.ebuild
+1305221826 ./dev-python/python-memcached/python-memcached-1.48-r1.ebuild
 1305221124 ./dev-python/python-memcached/python-memcached-1.50.ebuild
 1201081100 ./dev-python/python-memcached/python-memcached-1.48.ebuild
 1102272125 ./dev-python/python-memcached/python-memcached-1.47.ebuild
@@ -26263,12 +26281,10 @@
 1302170231 ./dev-python/cython/cython-0.18-r1.ebuild
 1211160619 ./dev-python/cython/cython-0.17.1.ebuild
 1206282001 ./dev-python/cython/cython-0.16.ebuild
-1202201431 ./dev-python/cython/cython-0.14.1.ebuild
 1302040832 ./dev-python/cython/cython-0.18.ebuild
 1211291230 ./dev-python/cython/cython-0.17.2.ebuild
-1203312313 ./dev-python/cython/cython-0.14.1-r1.ebuild
 1301111129 ./dev-python/cython/cython-0.17.4.ebuild
-1203312313 ./dev-python/cython/cython-0.15.1-r1.ebuild
+1305231226 ./dev-python/cython/cython-0.19.ebuild
 1211131831 ./dev-python/markdown/markdown-2.1.1.ebuild
 1301111201 ./dev-python/markdown/markdown-2.2.1.ebuild
 1303191203 ./dev-python/markdown/markdown-2.3.ebuild
@@ -26565,6 +26581,7 @@
 1204021431 ./dev-python/pypcap/pypcap-1.1-r1.ebuild
 1305221407 ./dev-python/rdflib/rdflib-4.0.ebuild
 1210070501 ./dev-python/rdflib/rdflib-3.2.2.ebuild
+1305222236 ./dev-python/rdflib/rdflib-4.0.1.ebuild
 1305122157 ./dev-python/rdflib/rdflib-3.2.3-r1.ebuild
 1210070501 ./dev-python/rdflib/rdflib-3.2.1.ebuild
 1210070501 ./dev-python/rdflib/rdflib-3.1.0.ebuild
@@ -26651,6 +26668,7 @@
 1302152331 ./dev-python/sphinx/sphinx-1.1.3-r6.ebuild
 1301041731 ./dev-python/sphinx/sphinx-1.1.3-r3.ebuild
 1302031501 ./dev-python/sphinx/sphinx-1.1.3-r5.ebuild
+1305230431 ./dev-python/sphinx/sphinx-1.1.3-r7.ebuild
 1302241402 ./dev-python/squaremap/squaremap-1.0.1.ebuild
 1301070331 ./dev-python/hgtools/hgtools-2.0.2.ebuild
 1305061931 ./dev-python/hgtools/hgtools-2.0.2-r1.ebuild
@@ -26716,11 +26734,12 @@
 1210090001 ./dev-python/twisted-web/twisted-web-12.2.0.ebuild
 1210132301 ./dev-python/beautifulsoup/beautifulsoup-3.2.1.ebuild
 1212271501 ./dev-python/beautifulsoup/beautifulsoup-4.1.3.ebuild
-1305031131 ./dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
+1305230231 ./dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r2.ebuild
+1305222301 ./dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
 1210132301 ./dev-python/beautifulsoup/beautifulsoup-3.2.0.ebuild
-1305181101 ./dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
-1210132301 ./dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild
-1302100523 ./dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
+1305222301 ./dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
+1305230201 ./dev-python/beautifulsoup/beautifulsoup-3.1.0.1-r1.ebuild
+1305230201 ./dev-python/beautifulsoup/beautifulsoup-3.2.1-r1.ebuild
 1305040701 ./dev-python/lockfile/lockfile-0.9.1-r1.ebuild
 1206091231 ./dev-python/lockfile/lockfile-0.9.1.ebuild
 1301260938 ./dev-python/lockfile/lockfile-0.8.ebuild
@@ -27193,6 +27212,7 @@
 1208090001 ./app-benchmarks/siege/siege-2.72.ebuild
 1305101001 ./app-benchmarks/siege/siege-3.0.0.ebuild
 1011102207 ./app-benchmarks/siege/siege-2.67.ebuild
+1305230955 ./app-benchmarks/siege/siege-3.0.1.ebuild
 1112230727 ./app-benchmarks/siege/siege-2.70.ebuild
 1011102207 ./app-benchmarks/siege/siege-2.66.ebuild
 1302042001 ./app-benchmarks/os-autoinst/os-autoinst-9999.ebuild
@@ -27617,10 +27637,10 @@
 1302180031 ./sys-fs/fuse/fuse-2.9.1-r1.ebuild
 1302180031 ./sys-fs/fuse/fuse-2.9.1.ebuild
 1005230557 ./sys-fs/lufs/lufs-0.9.7-r3.ebuild
-1211281501 ./sys-fs/lvm2/lvm2-2.02.97.ebuild
-1302242201 ./sys-fs/lvm2/lvm2-2.02.97-r1.ebuild
-1211281501 ./sys-fs/lvm2/lvm2-2.02.95-r4.ebuild
-1301180801 ./sys-fs/lvm2/lvm2-2.02.98.ebuild
+1305231831 ./sys-fs/lvm2/lvm2-2.02.97.ebuild
+1305231831 ./sys-fs/lvm2/lvm2-2.02.97-r1.ebuild
+1305231831 ./sys-fs/lvm2/lvm2-2.02.95-r4.ebuild
+1305231831 ./sys-fs/lvm2/lvm2-2.02.98.ebuild
 1303071701 ./sys-fs/ncdu/ncdu-1.9.ebuild
 1305100840 ./sys-fs/ncdu/ncdu-1.10.ebuild
 1205042331 ./sys-fs/s3fs/s3fs-1.61.ebuild
@@ -28414,12 +28434,9 @@
 1002210514 ./media-fonts/aquafont/aquafont-2.7-r4.ebuild
 0707221111 ./media-fonts/zh-kcfonts/zh-kcfonts-1.05-r2.ebuild
 1106141546 ./media-fonts/zh-kcfonts/zh-kcfonts-1.05-r3.ebuild
-1106142147 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre040.ebuild
-1201281933 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre046.ebuild
+1305231815 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre055.ebuild
 1007202024 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre030-r1.ebuild
-1210081401 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.ebuild
-1112031753 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043.ebuild
-1112180732 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre043-r1.ebuild
+1305231901 ./media-fonts/mplus-outline-fonts/mplus-outline-fonts-0_pre052.ebuild
 1106141455 ./media-fonts/ja-ipafonts/ja-ipafonts-003.03.ebuild
 1007220012 ./media-fonts/ja-ipafonts/ja-ipafonts-003.02-r1.ebuild
 1205151801 ./media-fonts/font-bh-100dpi/font-bh-100dpi-1.0.3.ebuild
@@ -28683,7 +28700,7 @@
 0906111742 ./media-sound/lltag/lltag-0.14.2.ebuild
 1108062313 ./media-sound/lltag/lltag-0.14.4.ebuild
 1303030201 ./media-sound/mixxx/mixxx-1.10.1.ebuild
-1305211931 ./media-sound/ncmpc/ncmpc-0.21.ebuild
+1305231601 ./media-sound/ncmpc/ncmpc-0.21.ebuild
 1207292101 ./media-sound/ncmpc/ncmpc-0.20.ebuild
 1205051301 ./media-sound/mpdas/mpdas-0.3.0.ebuild
 1203252101 ./media-sound/mplay/mplay-0.80.ebuild
@@ -28978,6 +28995,7 @@
 1303030201 ./media-sound/qmidiroute/qmidiroute-0.3.0.ebuild
 1112190020 ./media-sound/wavegain/wavegain-1.3.0.ebuild
 1208111831 ./media-sound/wavegain/wavegain-1.3.1.ebuild
+1305230550 ./media-sound/mpg123/mpg123-1.15.4.ebuild
 1302251207 ./media-sound/mpg123/mpg123-1.15.1.ebuild
 1304041047 ./media-sound/mpg123/mpg123-1.15.3.ebuild
 1212301901 ./media-sound/mpg123/mpg123-1.14.4.ebuild
@@ -29269,7 +29287,7 @@
 1301171531 ./media-video/libav/libav-0.8.9999.ebuild
 1302092231 ./media-video/libav/libav-0.8.5.ebuild
 1304051501 ./media-video/libav/libav-9.9999.ebuild
-1305212001 ./media-video/libav/libav-0.8.7.ebuild
+1305231531 ./media-video/libav/libav-0.8.7.ebuild
 1305201447 ./media-video/libav/libav-9.6.ebuild
 1205051301 ./media-video/lives/lives-1.4.6.ebuild
 1104281724 ./media-video/loopy/loopy-0.5.3.ebuild
@@ -29385,7 +29403,7 @@
 1305162301 ./media-video/emovix/emovix-0.9.0.ebuild
 1304131201 ./media-video/ffmpeg/ffmpeg-0.10.7.ebuild
 1304211431 ./media-video/ffmpeg/ffmpeg-1.0.6.ebuild
-1304041201 ./media-video/ffmpeg/ffmpeg-9999.ebuild
+1305230501 ./media-video/ffmpeg/ffmpeg-9999.ebuild
 1305101350 ./media-video/ffmpeg/ffmpeg-1.2.1.ebuild
 1305162101 ./media-video/ffmpeg/ffmpeg-1.0.7.ebuild
 1102131351 ./media-video/gaupol/gaupol-0.17.1.ebuild
@@ -29467,8 +29485,9 @@
 1304291117 ./media-video/mkvtoolnix/mkvtoolnix-6.2.0.ebuild
 1304060101 ./media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.0.8.ebuild
 1201062057 ./media-video/setpwc/setpwc-1.3.ebuild
+1305231848 ./media-video/handbrake/handbrake-0.9.9.ebuild
 1305161001 ./media-video/handbrake/handbrake-0.9.9_pre5441-r1.ebuild
-1305161001 ./media-video/handbrake/handbrake-9999.ebuild
+1305231901 ./media-video/handbrake/handbrake-9999.ebuild
 1111071143 ./media-video/snappy/snappy-9999.ebuild
 1111071143 ./media-video/snappy/snappy-0.2.ebuild
 1205051301 ./media-video/blinkensim/blinkensim-2.7.ebuild
@@ -31782,7 +31801,7 @@
 1012121936 ./games-misc/fortune-mod-norbert-tretkowski/fortune-mod-norbert-tretkowski-20030120.ebuild
 1010080749 ./games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20061115.ebuild
 1001101308 ./games-misc/fortune-mod-gentoo-dev/fortune-mod-gentoo-dev-20090306.ebuild
-1303010138 ./games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild
+1305231831 ./games-misc/katawa-shoujo/katawa-shoujo-1.0-r1.ebuild
 1012121227 ./games-misc/fortune-mod-starwars/fortune-mod-starwars-0.1.ebuild
 1305140317 ./games-misc/bsd-games/bsd-games-2.17-r5.ebuild
 1305101431 ./games-misc/bsd-games/bsd-games-2.17-r4.ebuild
@@ -33305,6 +33324,7 @@
 1209301231 ./net-analyzer/bwmon/bwmon-1.3.ebuild
 1205300003 ./net-analyzer/fping/fping-2.4_beta2_p161-r1.ebuild
 1205031902 ./net-analyzer/fping/fping-3.1.ebuild
+1305230403 ./net-analyzer/fping/fping-3.5.ebuild
 1204012001 ./net-analyzer/fping/fping-3.0.ebuild
 1205291433 ./net-analyzer/fping/fping-3.2.ebuild
 1209060601 ./net-analyzer/fping/fping-3.4.ebuild
@@ -33330,9 +33350,9 @@
 0710202126 ./net-analyzer/nikto/nikto-1.36.ebuild
 1108011851 ./net-analyzer/nikto/nikto-2.1.4.ebuild
 1301191926 ./net-analyzer/munin/munin-2.1.9999.ebuild
+1305231933 ./net-analyzer/munin/munin-2.0.14.ebuild
 1212231601 ./net-analyzer/munin/munin-2.0.8-r2.ebuild
 1303222131 ./net-analyzer/munin/munin-2.0.11.1.ebuild
-1304282329 ./net-analyzer/munin/munin-2.0.13.ebuild
 1302170401 ./net-analyzer/nload/nload-0.7.4.ebuild
 1207240431 ./net-analyzer/nttcp/nttcp-1.47-r1.ebuild
 1208200738 ./net-analyzer/pchar/pchar-1.5-r1.ebuild
@@ -33412,6 +33432,7 @@
 1303030301 ./net-analyzer/ostinato/ostinato-0.5.ebuild
 1303030301 ./net-analyzer/ostinato/ostinato-0.5.1.ebuild
 1205041031 ./net-analyzer/openvas-cli/openvas-cli-1.1.2.ebuild
+1305222110 ./net-analyzer/etherape/etherape-0.9.13.ebuild
 1210022331 ./net-analyzer/etherape/etherape-0.9.12.ebuild
 0905290520 ./net-analyzer/yersinia/yersinia-0.7.1.ebuild
 1209281101 ./net-analyzer/mbrowse/mbrowse-0.4.3.ebuild
@@ -33589,9 +33610,9 @@
 1009202232 ./net-analyzer/tptest/tptest-3.1.7-r1.ebuild
 0811081829 ./net-analyzer/tptest/tptest-3.1.7.ebuild
 1305011601 ./net-analyzer/wireshark/wireshark-1.8.6.ebuild
+1305231949 ./net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild
 1305201701 ./net-analyzer/wireshark/wireshark-1.6.15.ebuild
 1305201701 ./net-analyzer/wireshark/wireshark-1.8.7.ebuild
-1305081731 ./net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild
 1305011601 ./net-analyzer/wireshark/wireshark-1.6.14.ebuild
 1301171201 ./net-analyzer/goaccess/goaccess-0.5-r1.ebuild
 1302192322 ./net-analyzer/ipv6-toolkit/ipv6-toolkit-1.3.1.ebuild
@@ -36486,6 +36507,7 @@
 1305221011 metadata/md5-cache/sys-kernel/pf-sources-3.8.2
 1305221011 metadata/md5-cache/sys-kernel/pf-sources-3.9.1
 1305221011 metadata/md5-cache/sys-kernel/pf-sources-3.9.2
+1305231006 metadata/md5-cache/sys-kernel/pf-sources-3.9.3
 1305221011 metadata/md5-cache/sys-kernel/dracut-014-r3
 1305221011 metadata/md5-cache/sys-kernel/dracut-018-r3
 1305221011 metadata/md5-cache/sys-kernel/dracut-019-r6
@@ -37335,7 +37357,7 @@
 1305220943 metadata/md5-cache/dev-tex/latex-beamer-3.26
 1305220943 metadata/md5-cache/dev-tex/xmltex-1.9-r2
 1305150115 metadata/md5-cache/dev-vcs/svnmailer-1.0.9
-1305220944 metadata/md5-cache/dev-vcs/tortoisehg-9999
+1305231806 metadata/md5-cache/dev-vcs/tortoisehg-9999
 1305220944 metadata/md5-cache/dev-vcs/rsvndump-0.5.3
 1305220944 metadata/md5-cache/dev-vcs/rsvndump-0.5.4
 1305220944 metadata/md5-cache/dev-vcs/rsvndump-0.5.5
@@ -37386,7 +37408,7 @@
 1211091741 metadata/md5-cache/dev-vcs/cvs2cl-2.71
 1305150115 metadata/md5-cache/dev-vcs/hgview-1.6.2-r1
 1305220944 metadata/md5-cache/dev-vcs/topgit-0.8
-1305220944 metadata/md5-cache/dev-vcs/tortoisehg-2.8
+1305231806 metadata/md5-cache/dev-vcs/tortoisehg-2.8
 1305220944 metadata/md5-cache/dev-vcs/colorsvn-0.3.2-r2
 1305220944 metadata/md5-cache/dev-vcs/git-1.7.12.4
 1305220944 metadata/md5-cache/dev-vcs/cvs-1.12.13.1-r1
@@ -37538,8 +37560,6 @@
 1305220944 metadata/md5-cache/dev-vcs/gitolite-3.5.1
 1305150115 metadata/md5-cache/dev-vcs/gitstats-9999
 1305220944 metadata/md5-cache/dev-vcs/kdesvn-1.5.5-r2
-1305150115 metadata/md5-cache/dev-vcs/bzr-explorer-1.2.1
-1305150115 metadata/md5-cache/dev-vcs/bzr-explorer-1.2.2
 1305201236 metadata/md5-cache/dev-vcs/bzr-explorer-1.3.0
 1305220944 metadata/md5-cache/dev-vcs/gitg-0.0.6
 1305220944 metadata/md5-cache/dev-vcs/gitg-0.1.2
@@ -38907,7 +38927,7 @@
 1305221012 metadata/md5-cache/x11-libs/libdrm-2.4.42
 1305221012 metadata/md5-cache/x11-libs/libdrm-2.4.43
 1305221012 metadata/md5-cache/x11-libs/libdrm-2.4.44
-1305221012 metadata/md5-cache/x11-libs/libdrm-2.4.45
+1305231936 metadata/md5-cache/x11-libs/libdrm-2.4.45
 1305221012 metadata/md5-cache/x11-libs/glamor-0.5
 1305150126 metadata/md5-cache/x11-libs/libyui-ncurses-2.21.1
 1305221012 metadata/md5-cache/x11-libs/libfm-9999
@@ -39281,7 +39301,7 @@
 1305221013 metadata/md5-cache/x11-misc/virtualgl-2.3.2
 1305221013 metadata/md5-cache/x11-misc/vnc2swf-0.5.0-r1
 1305221013 metadata/md5-cache/x11-misc/dmenu-4.5-r2
-1305221013 metadata/md5-cache/x11-misc/dmenu-4.5-r3
+1305230736 metadata/md5-cache/x11-misc/dmenu-4.5-r3
 1305221013 metadata/md5-cache/x11-misc/chgres-0.1-r1
 1305150126 metadata/md5-cache/x11-misc/urxvt-perls-2.0
 1211091753 metadata/md5-cache/x11-misc/xtermcontrol-2.10
@@ -39832,7 +39852,7 @@
 1305221012 metadata/md5-cache/www-client/htmlview-3.0.0-r1
 1305221012 metadata/md5-cache/www-client/firefox-bin-20.0.1
 1305221012 metadata/md5-cache/www-client/chromium-27.0.1453.81
-1305221012 metadata/md5-cache/www-client/chromium-27.0.1453.93
+1305222136 metadata/md5-cache/www-client/chromium-27.0.1453.93
 1305221012 metadata/md5-cache/www-client/google-chrome-28.0.1500.20_alpha201172
 1305221012 metadata/md5-cache/www-client/epiphany-2.30.6-r1
 1305221012 metadata/md5-cache/www-client/netrik-1.16.1-r1
@@ -40143,6 +40163,7 @@
 1305150122 metadata/md5-cache/sci-libs/pymmlib-1.0.0-r1
 1305150122 metadata/md5-cache/sci-libs/libticonv-1.1.3
 1305221008 metadata/md5-cache/sci-libs/ceres-solver-1.4.0
+1305230136 metadata/md5-cache/sci-libs/ceres-solver-1.6.0
 1305221008 metadata/md5-cache/sci-libs/scipy-0.9.0-r1
 1305221008 metadata/md5-cache/sci-libs/jama-1.2.5
 1305221008 metadata/md5-cache/sci-libs/ogdi-3.2.0_beta2
@@ -40204,6 +40225,7 @@
 1305221009 metadata/md5-cache/sci-libs/starparse-1.0-r1
 1305221008 metadata/md5-cache/sci-libs/openfoam-1.7.1
 1305221008 metadata/md5-cache/sci-libs/mpir-2.6.0-r1
+1305222036 metadata/md5-cache/sci-libs/mpir-2.6.0-r2
 1305221008 metadata/md5-cache/sci-libs/openfoam-2.1.0
 1305221008 metadata/md5-cache/sci-libs/openfoam-2.1.1
 1305221008 metadata/md5-cache/sci-libs/openfoam-2.2.0
@@ -40785,7 +40807,7 @@
 1305150106 metadata/md5-cache/app-admin/eselect-opengl-1.2.3
 1305150106 metadata/md5-cache/app-admin/eselect-opengl-1.2.4
 1305150106 metadata/md5-cache/app-admin/eselect-opengl-1.2.6
-1305150106 metadata/md5-cache/app-admin/eselect-opengl-1.2.7
+1305231936 metadata/md5-cache/app-admin/eselect-opengl-1.2.7
 1211091733 metadata/md5-cache/app-admin/eselect-timidity-20110513
 1305220936 metadata/md5-cache/app-admin/gksu-polkit-0.0.3
 1305220936 metadata/md5-cache/app-admin/sulfur-1.0_rc104
@@ -41858,6 +41880,7 @@
 1305220937 metadata/md5-cache/app-emacs/javascript-2.0_beta8
 1305220937 metadata/md5-cache/app-emacs/cperl-mode-6.2
 1305220937 metadata/md5-cache/app-emacs/evil-1.0.1
+1305222036 metadata/md5-cache/app-emacs/evil-1.0.2
 1305220937 metadata/md5-cache/app-emacs/template-3.1c
 1305220937 metadata/md5-cache/app-emacs/auto-complete-1.3.1
 1305220937 metadata/md5-cache/app-emacs/binclock-1.7-r1
@@ -42869,6 +42892,7 @@
 1305221012 metadata/md5-cache/x11-drivers/nvidia-drivers-310.51
 1305221012 metadata/md5-cache/x11-drivers/nvidia-drivers-313.30
 1305221012 metadata/md5-cache/x11-drivers/nvidia-drivers-319.17
+1305231936 metadata/md5-cache/x11-drivers/nvidia-drivers-319.23
 1305221012 metadata/md5-cache/x11-drivers/xf86-video-mga-1.5.0
 1305221012 metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.0
 1305221012 metadata/md5-cache/x11-drivers/xf86-video-mga-1.6.1
@@ -43450,6 +43474,7 @@
 1305150107 metadata/md5-cache/app-i18n/scim-input-pad-0.1.3
 1305220937 metadata/md5-cache/app-i18n/pyzy-0.1.0
 1305220937 metadata/md5-cache/app-i18n/ibus-fbterm-0.9.1
+1305230036 metadata/md5-cache/app-i18n/transifex-client-0.9
 1305220937 metadata/md5-cache/app-i18n/jfbterm-0.4.7-r4
 1305220937 metadata/md5-cache/app-i18n/multiskkserv-20020201
 1305220937 metadata/md5-cache/app-i18n/fcitx-configtool-0.4.4-r1
@@ -43778,6 +43803,7 @@
 1305220937 metadata/md5-cache/app-misc/tmux-1.8
 1211091734 metadata/md5-cache/app-misc/joy2key-1.6.3
 1305220937 metadata/md5-cache/app-misc/jq-1.2
+1305231106 metadata/md5-cache/app-misc/jq-1.3
 1305220937 metadata/md5-cache/app-misc/tkpasman-2.2b
 1305220937 metadata/md5-cache/app-misc/sleepyhead-0.9.3
 1305150108 metadata/md5-cache/app-misc/ondir-0.2.2-r1
@@ -43794,6 +43820,7 @@
 1305220937 metadata/md5-cache/app-misc/g15composer-3.2
 1305220937 metadata/md5-cache/app-misc/gramps-3.4.3
 1305220937 metadata/md5-cache/app-misc/gramps-3.4.4
+1305230206 metadata/md5-cache/app-misc/gramps-3.4.5
 1305150107 metadata/md5-cache/app-misc/detachtty-9
 1305220937 metadata/md5-cache/app-misc/lcdproc-0.5.2-r1
 1305220937 metadata/md5-cache/app-misc/lcdproc-0.5.6-r1
@@ -44245,7 +44272,7 @@
 1305220938 metadata/md5-cache/app-text/htmlinc-1.0_beta1
 1305220938 metadata/md5-cache/app-text/poppler-0.22.2-r2
 1305220938 metadata/md5-cache/app-text/jing-20091111-r1
-1305210536 metadata/md5-cache/app-text/pastebinit-1.3.1-r1
+1305231606 metadata/md5-cache/app-text/pastebinit-1.3.1-r1
 1305220938 metadata/md5-cache/app-text/gtkspell-2.0.16
 1305220938 metadata/md5-cache/app-text/cuneiform-1.1.0-r1
 1305150108 metadata/md5-cache/app-text/txt2pdbdoc-1.4.4
@@ -44384,7 +44411,7 @@
 1305220938 metadata/md5-cache/app-text/htmldoc-1.8.27-r3
 1211091735 metadata/md5-cache/app-text/flpsed-0.7.0
 1305220938 metadata/md5-cache/app-text/liblangtag-0.5.1
-1305220938 metadata/md5-cache/app-text/sword-1.6.2
+1305231836 metadata/md5-cache/app-text/sword-1.6.2
 1305150108 metadata/md5-cache/app-text/lodgeit-0.3_p20120507
 1305220938 metadata/md5-cache/app-text/xindy-2.4
 1305220938 metadata/md5-cache/app-text/cmigemo-1.3c-r1
@@ -44561,7 +44588,7 @@
 1305220938 metadata/md5-cache/app-text/evince-3.8.0
 1305220938 metadata/md5-cache/app-text/evince-3.8.2
 1305220938 metadata/md5-cache/app-text/catdoc-0.94.2-r2
-1305220938 metadata/md5-cache/app-text/libodfgen-0.0.1
+1305231506 metadata/md5-cache/app-text/libodfgen-0.0.2
 1305220938 metadata/md5-cache/app-text/trang-20091111
 1305220938 metadata/md5-cache/app-text/zathura-0.2.1
 1305220938 metadata/md5-cache/app-text/zathura-0.2.2
@@ -44572,7 +44599,7 @@
 1305201836 metadata/md5-cache/app-text/gocr-0.50
 1305150108 metadata/md5-cache/app-text/pspresent-1.3-r1
 1305220938 metadata/md5-cache/app-text/stardict-3.0.3-r2
-1305220938 metadata/md5-cache/app-text/qpdfview-0.4.2-r1
+1305231236 metadata/md5-cache/app-text/qpdfview-0.4.2-r1
 1305220938 metadata/md5-cache/app-text/xlhtml-0.5.1_p6
 1305220938 metadata/md5-cache/app-text/chasen-2.4.0
 1305220938 metadata/md5-cache/app-text/chasen-2.4.4
@@ -46596,6 +46623,7 @@
 1305220946 metadata/md5-cache/kde-misc/kwebkitpart-1.3.1
 1305220946 metadata/md5-cache/kde-misc/krunner-kopete-contacts-0.4
 1305220946 metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20120222
+1305222236 metadata/md5-cache/kde-misc/akonadi-git-resource-0_p20130522
 1305220946 metadata/md5-cache/kde-misc/krcstat-0.7.6
 1305220946 metadata/md5-cache/kde-misc/yawp-0.4.4
 1305220946 metadata/md5-cache/kde-misc/smooth-tasks-0_p20120130
@@ -46797,10 +46825,10 @@
 1305220946 metadata/md5-cache/mail-client/evolution-3.8.1
 1305220946 metadata/md5-cache/mail-client/evolution-3.8.2
 1305220946 metadata/md5-cache/mail-client/alpine-2.00-r5
-1305220946 metadata/md5-cache/mail-client/sylpheed-3.2.0
 1305220946 metadata/md5-cache/mail-client/sylpheed-3.3.0
 1305220946 metadata/md5-cache/mail-client/claws-mail-vcalendar-2.0.14
 1305220946 metadata/md5-cache/mail-client/gbuffy-0.2.6-r1
+1305230206 metadata/md5-cache/mail-client/clawsker-0.7.10
 1305220946 metadata/md5-cache/mail-client/nmh-1.3-r3
 1211091744 metadata/md5-cache/mail-client/biabam-0.9.7
 1305220946 metadata/md5-cache/mail-client/claws-mail-gtkhtml-0.34
@@ -47137,7 +47165,7 @@
 1211091744 metadata/md5-cache/media-gfx/galleryadd-2.30
 1305220946 metadata/md5-cache/media-gfx/photivo-9999
 1305220946 metadata/md5-cache/media-gfx/ufraw-0.19.1
-1305221506 metadata/md5-cache/media-gfx/ufraw-0.19.2
+1305231006 metadata/md5-cache/media-gfx/ufraw-0.19.2
 1305150117 metadata/md5-cache/media-gfx/apngdis-2.3
 1305150117 metadata/md5-cache/media-gfx/apngdis-2.4
 1305150117 metadata/md5-cache/media-gfx/apngdis-2.5
@@ -47470,7 +47498,7 @@
 1211091747 metadata/md5-cache/net-dns/valtz-0.7
 1305220948 metadata/md5-cache/net-dns/pdns-ldap-backend-0.2
 1305220948 metadata/md5-cache/net-dns/pdns-3.1
-1305220948 metadata/md5-cache/net-dns/pdns-3.2
+1305231636 metadata/md5-cache/net-dns/pdns-3.2
 1305220948 metadata/md5-cache/net-dns/dnsmasq-2.63
 1305220948 metadata/md5-cache/net-dns/dnsmasq-2.65
 1305220948 metadata/md5-cache/net-dns/dnsmasq-2.66
@@ -47542,6 +47570,7 @@
 1305220948 metadata/md5-cache/net-ftp/pureadmin-0.4-r1
 1305220948 metadata/md5-cache/net-ftp/lftp-4.4.5
 1305220948 metadata/md5-cache/net-ftp/lftp-4.4.6
+1305231936 metadata/md5-cache/net-ftp/lftp-4.4.7
 1305220948 metadata/md5-cache/net-ftp/ftp-0.17-r7
 1305220948 metadata/md5-cache/net-ftp/oneclickftp-0.5.1
 1305220948 metadata/md5-cache/net-ftp/profxp-3_pre2
@@ -47623,6 +47652,7 @@
 1211181736 metadata/md5-cache/net-irc/nebula-0.5
 1305220948 metadata/md5-cache/net-irc/irssi-0.8.15-r1
 1305220948 metadata/md5-cache/net-irc/weechat-0.4.0
+1305231606 metadata/md5-cache/net-irc/weechat-0.4.1
 1305220948 metadata/md5-cache/net-irc/dircproxy-1.2.0_rc1
 1305220948 metadata/md5-cache/net-irc/xaric-0.13.5
 1305220948 metadata/md5-cache/net-irc/kvirc-4.4_pre6250
@@ -48316,7 +48346,7 @@
 1305220947 metadata/md5-cache/media-libs/phonon-9999
 1305220947 metadata/md5-cache/media-libs/jasper-1.900.1-r5
 1305220947 metadata/md5-cache/media-libs/jasper-1.900.1-r6
-1305220947 metadata/md5-cache/media-libs/mesa-9.1.2-r1
+1305231936 metadata/md5-cache/media-libs/mesa-9.1.2-r1
 1305220947 metadata/md5-cache/media-libs/libmikmod-3.2.0
 1305220947 metadata/md5-cache/media-libs/opencv-2.4.4a
 1211091745 metadata/md5-cache/media-libs/libj2k-0.0.9
@@ -48419,6 +48449,7 @@
 1305220947 metadata/md5-cache/media-libs/mesa-9.0.3
 1305220947 metadata/md5-cache/media-libs/mesa-9.1.1
 1305220947 metadata/md5-cache/media-libs/mesa-9.1.2
+1305230436 metadata/md5-cache/media-libs/mesa-9.1.3
 1305220946 metadata/md5-cache/media-libs/coin-3.1.0
 1305220947 metadata/md5-cache/media-libs/gst-plugins-good-1.0.5
 1305220947 metadata/md5-cache/media-libs/gst-plugins-good-1.0.6
@@ -48502,7 +48533,7 @@
 1305220947 metadata/md5-cache/media-libs/vamp-plugin-sdk-2.3
 1305220947 metadata/md5-cache/media-libs/vamp-plugin-sdk-2.5
 1305220947 metadata/md5-cache/media-libs/libcdr-0.0.13
-1305220947 metadata/md5-cache/media-libs/libcdr-0.0.14
+1305221936 metadata/md5-cache/media-libs/libcdr-0.0.14
 1305220947 metadata/md5-cache/media-libs/libkarma-0.1.2
 1305220947 metadata/md5-cache/media-libs/spandsp-0.0.6_pre12-r1
 1305220947 metadata/md5-cache/media-libs/libgpod-0.8.2
@@ -49271,6 +49302,7 @@
 1305221010 metadata/md5-cache/sys-apps/hwids-20130302
 1305221010 metadata/md5-cache/sys-apps/hwids-20130329
 1305221010 metadata/md5-cache/sys-apps/hwids-20130514
+1305231906 metadata/md5-cache/sys-apps/hwids-20130523
 1211091750 metadata/md5-cache/sys-apps/keyutils-1.0
 1305150123 metadata/md5-cache/sys-apps/keyutils-1.1
 1305150123 metadata/md5-cache/sys-apps/keyutils-1.2
@@ -49347,10 +49379,9 @@
 1305221010 metadata/md5-cache/sys-apps/uam-9999
 1305221010 metadata/md5-cache/sys-apps/x86info-1.30
 1305221010 metadata/md5-cache/sys-apps/hwdata-gentoo-0.4
-1305221010 metadata/md5-cache/sys-apps/lnxhc-1.2
 1305150123 metadata/md5-cache/sys-apps/gptfdisk-0.8.4
 1305150123 metadata/md5-cache/sys-apps/gptfdisk-0.8.5
-1305221010 metadata/md5-cache/sys-apps/gptfdisk-0.8.6
+1305230206 metadata/md5-cache/sys-apps/gptfdisk-0.8.6
 1305221010 metadata/md5-cache/sys-apps/timer_entropyd-0.1-r3
 1305221010 metadata/md5-cache/sys-apps/moreutils-0.47
 1305221010 metadata/md5-cache/sys-apps/moreutils-0.48
@@ -49400,6 +49431,7 @@
 1305221010 metadata/md5-cache/sys-apps/smartmontools-5.41-r1
 1305221010 metadata/md5-cache/sys-apps/etckeeper-0.63
 1305221010 metadata/md5-cache/sys-apps/hardened-shadow-0.9.2
+1305230136 metadata/md5-cache/sys-apps/lnxhc-1.2-r1
 1212152106 metadata/md5-cache/sys-apps/newrelic-sysmond-1.1.2.124
 1305221010 metadata/md5-cache/sys-apps/portage-9999
 1305221010 metadata/md5-cache/sys-apps/memtest86-4.0s
@@ -49776,6 +49808,7 @@
 1211091750 metadata/md5-cache/sys-apps/logwatch-7.4.0
 1305221010 metadata/md5-cache/sys-apps/fakeroot-1.18.4
 1211091750 metadata/md5-cache/sys-apps/kbd-1.15.2-r1
+1305230736 metadata/md5-cache/sys-apps/which-2.20-r1
 1305221010 metadata/md5-cache/sys-apps/kbd-1.15.5-r1
 1212162236 metadata/md5-cache/sys-apps/lsb-release-1.4
 1305221010 metadata/md5-cache/sys-apps/netplug-1.2.9-r5
@@ -50479,7 +50512,7 @@
 1305220937 metadata/md5-cache/app-emulation/vmware-view-open-client-4.5.0.297975-r1
 1305220937 metadata/md5-cache/app-emulation/xen-pvgrub-4.2.0-r1
 1305220937 metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r1
-1305220937 metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r2
+1305231606 metadata/md5-cache/app-emulation/xen-pvgrub-4.2.1-r2
 1305220937 metadata/md5-cache/app-emulation/spectemu-0.99.3
 1211091734 metadata/md5-cache/app-emulation/libspectrum-0.2.2-r1
 1305220937 metadata/md5-cache/app-emulation/q4wine-1.0-r1
@@ -50590,7 +50623,7 @@
 1305150107 metadata/md5-cache/app-emulation/emul-linux-x86-gstplugins-20121202
 1305150107 metadata/md5-cache/app-emulation/emul-linux-x86-opengl-20130224
 1305150107 metadata/md5-cache/app-emulation/emul-linux-x86-gstplugins-20130224
-1305220937 metadata/md5-cache/app-emulation/libvirt-9999
+1305222006 metadata/md5-cache/app-emulation/libvirt-9999
 1211091734 metadata/md5-cache/app-emulation/dlx-1.0.0
 1305220937 metadata/md5-cache/app-emulation/wine-1.3.28
 1305220937 metadata/md5-cache/app-emulation/wine-1.5.17
@@ -50634,7 +50667,7 @@
 1305220937 metadata/md5-cache/app-emulation/wine-1.5.15-r2
 1305220937 metadata/md5-cache/app-emulation/wine-1.5.16-r1
 1305220937 metadata/md5-cache/app-emulation/wine-1.5.23-r1
-1305220937 metadata/md5-cache/app-emulation/libvirt-1.0.5.1
+1305222006 metadata/md5-cache/app-emulation/libvirt-1.0.5.1
 1305220937 metadata/md5-cache/app-emulation/qemu-user-0.9.0
 1305220937 metadata/md5-cache/app-emulation/qemu-user-1.1.0
 1305220937 metadata/md5-cache/app-emulation/qemu-user-1.2.2
@@ -50650,9 +50683,7 @@
 1305220937 metadata/md5-cache/app-emulation/xen-4.2.1-r2
 1305220937 metadata/md5-cache/app-emulation/xen-4.2.1-r3
 1305220937 metadata/md5-cache/app-emulation/spectemu-0.99.3-r1
-1305220937 metadata/md5-cache/app-emulation/libvirt-1.0.0
-1305220937 metadata/md5-cache/app-emulation/libvirt-1.0.4
-1305220937 metadata/md5-cache/app-emulation/libvirt-1.0.5
+1305222006 metadata/md5-cache/app-emulation/libvirt-1.0.4
 1305220937 metadata/md5-cache/app-emulation/lxc-0.8.0-r1
 1302030236 metadata/md5-cache/app-emulation/spice-protocol-0.12.2
 1303011406 metadata/md5-cache/app-emulation/spice-protocol-0.12.3
@@ -50729,8 +50760,7 @@
 1305220937 metadata/md5-cache/app-emulation/libguestfs-1.20.6
 1305220937 metadata/md5-cache/app-emulation/vmware-workstation-7.1.6.744570
 1305220937 metadata/md5-cache/app-emulation/libvirt-1.0.2-r2
-1305220937 metadata/md5-cache/app-emulation/libvirt-1.0.3-r1
-1305220937 metadata/md5-cache/app-emulation/libvirt-1.0.3-r2
+1305222006 metadata/md5-cache/app-emulation/libvirt-1.0.3-r2
 1305220937 metadata/md5-cache/app-emulation/gxemul-0.6.0-r1
 1305221008 metadata/md5-cache/sci-chemistry/apbs-1.3-r3
 1305221008 metadata/md5-cache/sci-chemistry/refmac-5.6.0119
@@ -50764,6 +50794,7 @@
 1305221008 metadata/md5-cache/sci-chemistry/aria-2.3.2-r4
 1305221008 metadata/md5-cache/sci-chemistry/aria-2.3.2-r5
 1305221008 metadata/md5-cache/sci-chemistry/balbes-1.0.0_p100317-r2
+1305221906 metadata/md5-cache/sci-chemistry/numbat-0.999-r1
 1305221008 metadata/md5-cache/sci-chemistry/procheck-3.5.4-r1
 1302271906 metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r1
 1305221008 metadata/md5-cache/sci-chemistry/mpqc-2.3.1-r2
@@ -50837,7 +50868,6 @@
 1305221008 metadata/md5-cache/sci-chemistry/icm-3.7.2d
 1305221008 metadata/md5-cache/sci-chemistry/icm-3.7.2e
 1305221008 metadata/md5-cache/sci-chemistry/mosflm-7.0.9
-1305221008 metadata/md5-cache/sci-chemistry/numbat-0.999
 1305150122 metadata/md5-cache/sci-chemistry/elem-1.0.3-r1
 1305150122 metadata/md5-cache/sci-chemistry/elem-1.0.3-r2
 1305221008 metadata/md5-cache/sci-chemistry/gperiodic-2.0.10-r2
@@ -51119,7 +51149,7 @@
 1305221010 metadata/md5-cache/sys-cluster/cman-3.1.5
 1305221010 metadata/md5-cache/sys-cluster/pacemaker-1.1.8-r2
 1305221010 metadata/md5-cache/sys-cluster/torque-2.5.9-r1
-1305221010 metadata/md5-cache/sys-cluster/crmsh-1.2.5-r1
+1305231406 metadata/md5-cache/sys-cluster/crmsh-1.2.5-r2
 1305221010 metadata/md5-cache/sys-cluster/openais-1.1.4-r1
 1305221010 metadata/md5-cache/sys-cluster/polysh-0.4-r1
 1305221010 metadata/md5-cache/sys-cluster/heartbeat-3.0.5-r1
@@ -51275,6 +51305,7 @@
 1211091747 metadata/md5-cache/net-im/imcom-1.32
 1211091747 metadata/md5-cache/net-im/imcom-1.33
 1211091747 metadata/md5-cache/net-im/imcom-1.34
+1305231306 metadata/md5-cache/net-im/skype-4.2.0.11
 1305220948 metadata/md5-cache/net-im/ktp-desktop-applets-0.6.1
 1305220948 metadata/md5-cache/net-im/ktp-desktop-applets-0.6.2
 1305220948 metadata/md5-cache/net-im/minbif-1.0.1
@@ -51534,7 +51565,7 @@
 1211091747 metadata/md5-cache/net-libs/gupnp-ui-0.1.1
 1305220948 metadata/md5-cache/net-libs/hubbub-0.1.2
 1211091747 metadata/md5-cache/net-libs/pjsip-1.8.10
-1305221436 metadata/md5-cache/net-libs/gnutls-3.2.0
+1305222306 metadata/md5-cache/net-libs/gnutls-3.2.0
 1305220949 metadata/md5-cache/net-libs/webkit-gtk-2.0.1
 1305220949 metadata/md5-cache/net-libs/webkit-gtk-2.0.2
 1305220948 metadata/md5-cache/net-libs/cvm-0.76
@@ -51611,7 +51642,8 @@
 1305220948 metadata/md5-cache/net-libs/libbtbb-2012.10.3
 1305220949 metadata/md5-cache/net-libs/nativebiginteger-0.6.4-r3
 1305220949 metadata/md5-cache/net-libs/libyahoo2-1.0.1
-1305220948 metadata/md5-cache/net-libs/libkgapi-0.4.4
+1305230036 metadata/md5-cache/net-libs/libkgapi-0.4.4
+1305230036 metadata/md5-cache/net-libs/libkgapi-2.0.0
 1211091747 metadata/md5-cache/net-libs/libzrtpcpp-0.9.0
 1211091747 metadata/md5-cache/net-libs/libzrtpcpp-1.3.0
 1211091747 metadata/md5-cache/net-libs/libzrtpcpp-1.4.1
@@ -51952,6 +51984,7 @@
 1211091747 metadata/md5-cache/net-mail/tnef-1.4.9
 1305220949 metadata/md5-cache/net-mail/libpst-0.6.55
 1305220949 metadata/md5-cache/net-mail/libpst-0.6.58
+1305231036 metadata/md5-cache/net-mail/libpst-0.6.59
 1305220949 metadata/md5-cache/net-mail/dovecot-2.1.16-r1
 1305220949 metadata/md5-cache/net-mail/courierpassd-1.1.2
 1305220949 metadata/md5-cache/net-mail/asmail-2.1
@@ -52297,6 +52330,7 @@
 1305220949 metadata/md5-cache/net-misc/networkmanager-sstp-0.9.4
 1305220949 metadata/md5-cache/net-misc/apt-cacher-ng-0.7.11
 1305220949 metadata/md5-cache/net-misc/apt-cacher-ng-0.7.12
+1305221836 metadata/md5-cache/net-misc/apt-cacher-ng-0.7.13
 1305220949 metadata/md5-cache/net-misc/lksctp-tools-1.0.13
 1305162006 metadata/md5-cache/net-misc/cfengine-3.2.4
 1211091747 metadata/md5-cache/net-misc/cfengine-3.3.5
@@ -52720,8 +52754,7 @@
 1305220949 metadata/md5-cache/net-misc/rabbitmq-server-2.8.7
 1305220949 metadata/md5-cache/net-misc/rabbitmq-server-3.0.2
 1305220949 metadata/md5-cache/net-misc/rabbitmq-server-3.0.4
-1305220949 metadata/md5-cache/net-misc/rabbitmq-server-3.1.0
-1305220949 metadata/md5-cache/net-misc/rabbitmq-server-3.1.1
+1305221936 metadata/md5-cache/net-misc/rabbitmq-server-3.1.1
 1305220949 metadata/md5-cache/net-misc/minissdpd-1.2-r1
 1305220949 metadata/md5-cache/net-misc/rwhoisd-1.5.9.5
 1211091747 metadata/md5-cache/net-misc/ipsc-0.4.3.2
@@ -53453,6 +53486,7 @@
 1305150126 metadata/md5-cache/x11-wm/i3-4.4
 1305221013 metadata/md5-cache/x11-wm/vtwm-5.4.7-r1
 1305221013 metadata/md5-cache/x11-wm/fluxbox-1.1.1-r3
+1305230206 metadata/md5-cache/x11-wm/goomwwm-1.0.0
 1305221013 metadata/md5-cache/x11-wm/spectrwm-2.1.1
 1305221013 metadata/md5-cache/x11-wm/spectrwm-2.2.0
 1305221013 metadata/md5-cache/x11-wm/spectrwm-2.3.0
@@ -53583,6 +53617,7 @@
 1305220939 metadata/md5-cache/dev-java/freehep-mcfio-2.0.1
 1305220939 metadata/md5-cache/dev-java/cpptasks-1.0_beta4-r2
 1305220939 metadata/md5-cache/dev-java/icedtea-6.1.12.4
+1305231006 metadata/md5-cache/dev-java/icedtea-6.1.12.5
 1305220940 metadata/md5-cache/dev-java/xml-commons-external-1.3.04
 1305220940 metadata/md5-cache/dev-java/xml-commons-external-1.4.01
 1305220939 metadata/md5-cache/dev-java/dbunit-2.4.1
@@ -54125,6 +54160,7 @@
 1305220939 metadata/md5-cache/dev-java/lucene-2.3.2-r1
 1305220939 metadata/md5-cache/dev-java/lucene-2.3.2-r2
 1305220939 metadata/md5-cache/dev-java/jfreechart-1.0.13
+1305221736 metadata/md5-cache/dev-java/jfreechart-1.0.14
 1305220939 metadata/md5-cache/dev-java/relaxng-datatype-1.0-r1
 1305220939 metadata/md5-cache/dev-java/jna-3.4.0-r1
 1305220940 metadata/md5-cache/dev-java/xpp2-2.1.10-r1
@@ -54890,6 +54926,7 @@
 1305220940 metadata/md5-cache/dev-lang/v8-3.17.15.3
 1305220940 metadata/md5-cache/dev-lang/v8-3.17.16.2
 1305220940 metadata/md5-cache/dev-lang/R-3.0.0
+1305231906 metadata/md5-cache/dev-lang/R-3.0.1
 1211091737 metadata/md5-cache/dev-lang/opendylan-bin-2011.1
 1212241406 metadata/md5-cache/dev-lang/opendylan-bin-2012.1
 1305220940 metadata/md5-cache/dev-lang/blassic-0.10.2
@@ -55679,7 +55716,7 @@
 1211091737 metadata/md5-cache/dev-libs/asyncresolv-0.0.3
 1305220940 metadata/md5-cache/dev-libs/elfio-1.0.3
 1305220940 metadata/md5-cache/dev-libs/zziplib-0.13.60-r1
-1305221506 metadata/md5-cache/dev-libs/geoip-1.5.0
+1305222236 metadata/md5-cache/dev-libs/geoip-1.5.0
 1305220940 metadata/md5-cache/dev-libs/libg15render-9999
 1305150111 metadata/md5-cache/dev-libs/uulib-0.5.20
 1305220940 metadata/md5-cache/dev-libs/syck-0.55-r4
@@ -55792,7 +55829,7 @@
 1305220940 metadata/md5-cache/dev-libs/log4cxx-0.10.0
 1305150110 metadata/md5-cache/dev-libs/dclog-1.1.1-r1
 1305220940 metadata/md5-cache/dev-libs/distorm64-1.7.30-r1
-1305220940 metadata/md5-cache/dev-libs/geoip-1.5.0-r1
+1305222236 metadata/md5-cache/dev-libs/geoip-1.5.0-r1
 1305150111 metadata/md5-cache/dev-libs/ustr-1.0.4-r1
 1305220940 metadata/md5-cache/dev-libs/embryo-1.7.4
 1305220940 metadata/md5-cache/dev-libs/gmp-4.3.2
@@ -55857,10 +55894,6 @@
 1305220940 metadata/md5-cache/dev-libs/libcdio-paranoia-0.90_p1
 1305220940 metadata/md5-cache/dev-libs/libmemcached-0.34-r1
 1305220940 metadata/md5-cache/dev-libs/libnl-3.2.14
-1305220940 metadata/md5-cache/dev-libs/libnl-3.2.16
-1305220940 metadata/md5-cache/dev-libs/libnl-3.2.18
-1305220940 metadata/md5-cache/dev-libs/libnl-3.2.19
-1305220940 metadata/md5-cache/dev-libs/libnl-3.2.20
 1305220940 metadata/md5-cache/dev-libs/libnl-3.2.21
 1305220940 metadata/md5-cache/dev-libs/libnl-3.2.22
 1305150111 metadata/md5-cache/dev-libs/libhid-0.2.16-r3
@@ -57892,7 +57925,6 @@
 1305220943 metadata/md5-cache/dev-ruby/main-5.1.1
 1305220943 metadata/md5-cache/dev-ruby/main-5.2.0
 1305220943 metadata/md5-cache/dev-ruby/rake-compiler-0.8.1-r1
-1305220942 metadata/md5-cache/dev-ruby/amqp-0.9.7
 1305220942 metadata/md5-cache/dev-ruby/amqp-0.9.8
 1305220942 metadata/md5-cache/dev-ruby/css_parser-1.2.6
 1305220943 metadata/md5-cache/dev-ruby/sary-ruby-1.2.0-r2
@@ -58256,7 +58288,7 @@
 1305220942 metadata/md5-cache/dev-ruby/chunky_png-1.2.8
 1305220943 metadata/md5-cache/dev-ruby/rspec-core-2.6.4-r1
 1305220943 metadata/md5-cache/dev-ruby/rbtree-0.3.0-r2
-1305220943 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2
+1305231536 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0.2
 1305220943 metadata/md5-cache/dev-ruby/ruby-taglib-1.1-r1
 1305220943 metadata/md5-cache/dev-ruby/gemcutter-0.7.1
 1305220943 metadata/md5-cache/dev-ruby/vlad-2.2.5
@@ -58269,12 +58301,10 @@
 1305220943 metadata/md5-cache/dev-ruby/json-1.7.7-r1
 1305220943 metadata/md5-cache/dev-ruby/ohai-0.6.12
 1305220943 metadata/md5-cache/dev-ruby/transaction-simple-1.4.0-r1
-1305220943 metadata/md5-cache/dev-ruby/mocha-0.10.5
-1305220943 metadata/md5-cache/dev-ruby/mocha-0.11.4
-1305220943 metadata/md5-cache/dev-ruby/mocha-0.12.7
-1305220943 metadata/md5-cache/dev-ruby/mocha-0.13.0
-1305220943 metadata/md5-cache/dev-ruby/mocha-0.13.1
-1305220943 metadata/md5-cache/dev-ruby/mocha-0.13.3
+1305222206 metadata/md5-cache/dev-ruby/mocha-0.10.5
+1305222206 metadata/md5-cache/dev-ruby/mocha-0.11.4
+1305222206 metadata/md5-cache/dev-ruby/mocha-0.12.7
+1305222206 metadata/md5-cache/dev-ruby/mocha-0.13.3
 1305220943 metadata/md5-cache/dev-ruby/yard-0.8.6.1
 1305220943 metadata/md5-cache/dev-ruby/narray-0.6.0.1-r2
 1305220942 metadata/md5-cache/dev-ruby/childprocess-0.3.6
@@ -58549,6 +58579,7 @@
 1305220943 metadata/md5-cache/dev-ruby/multi_json-1.4.0
 1305220943 metadata/md5-cache/dev-ruby/multi_json-1.5.0
 1305220942 metadata/md5-cache/dev-ruby/duby-0.0.2
+1305230906 metadata/md5-cache/dev-ruby/amq-client-1.0.2
 1305220943 metadata/md5-cache/dev-ruby/spork-0.9.2
 1305220943 metadata/md5-cache/dev-ruby/samuel-0.3.3
 1305220943 metadata/md5-cache/dev-ruby/rake-remote_task-2.0.6
@@ -58601,6 +58632,7 @@
 1305220942 metadata/md5-cache/dev-ruby/amq-protocol-1.0.1
 1305220942 metadata/md5-cache/dev-ruby/amq-protocol-1.2.0
 1305220942 metadata/md5-cache/dev-ruby/amq-protocol-1.3.0
+1305230906 metadata/md5-cache/dev-ruby/amq-protocol-1.6.0
 1305220943 metadata/md5-cache/dev-ruby/ruby-elf-9999
 1305220943 metadata/md5-cache/dev-ruby/term-ansicolor-1.0.7
 1305220943 metadata/md5-cache/dev-ruby/term-ansicolor-1.1.5
@@ -58951,7 +58983,7 @@
 1305220944 metadata/md5-cache/dev-util/ctags-5.8
 1305220944 metadata/md5-cache/dev-util/eric-4.5.8
 1305220944 metadata/md5-cache/dev-util/eric-5.2.7
-1305220944 metadata/md5-cache/dev-util/eric-5.3.2
+1305231606 metadata/md5-cache/dev-util/eric-5.3.2
 1305221406 metadata/md5-cache/dev-util/eric-5.3.3
 1305150115 metadata/md5-cache/dev-util/tailor-0.9.35
 1305150115 metadata/md5-cache/dev-util/makeheaders-0_p4
@@ -59116,6 +59148,7 @@
 1305220944 metadata/md5-cache/dev-util/debootstrap-1.0.49
 1305220944 metadata/md5-cache/dev-util/debootstrap-1.0.50
 1305220944 metadata/md5-cache/dev-util/debootstrap-1.0.51
+1305230736 metadata/md5-cache/dev-util/debootstrap-1.0.52
 1305220944 metadata/md5-cache/dev-util/synopsis-0.12
 1305220944 metadata/md5-cache/dev-util/synopsis-0.13
 1303261806 metadata/md5-cache/dev-util/obs-service-extract_file-20130318
@@ -59196,7 +59229,7 @@
 1305150115 metadata/md5-cache/dev-util/lockrun-2
 1211091741 metadata/md5-cache/dev-util/acgmake-1.2-r1
 1305220943 metadata/md5-cache/dev-util/acgmake-1.2-r2
-1305221236 metadata/md5-cache/dev-util/eric-4.5.10
+1305231606 metadata/md5-cache/dev-util/eric-4.5.10
 1305220944 metadata/md5-cache/dev-util/ketchup-1.0
 1305220944 metadata/md5-cache/dev-util/exmap-0.10
 1211091741 metadata/md5-cache/dev-util/diffball-1.0
@@ -59335,6 +59368,7 @@
 1305150113 metadata/md5-cache/dev-python/rdflib-3.2.3
 1305220942 metadata/md5-cache/dev-python/pyifp-0.2.2
 1305150113 metadata/md5-cache/dev-python/pysnmp-3.4.4
+1305222306 metadata/md5-cache/dev-python/rdflib-4.0.1
 1305150113 metadata/md5-cache/dev-python/pysnmp-4.2.1
 1305150113 metadata/md5-cache/dev-python/pysnmp-4.2.2
 1305220942 metadata/md5-cache/dev-python/tlslite-0.3.8-r2
@@ -59459,7 +59493,7 @@
 1305150113 metadata/md5-cache/dev-python/pupynere-1.0.15
 1305150112 metadata/md5-cache/dev-python/ipdb-0.7
 1305220942 metadata/md5-cache/dev-python/setuptools-0.6.30-r1
-1305220942 metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
+1305222306 metadata/md5-cache/dev-python/beautifulsoup-4.1.3-r1
 1305150112 metadata/md5-cache/dev-python/chameleon-2.8.3-r1
 1305220942 metadata/md5-cache/dev-python/webob-1.1
 1305220942 metadata/md5-cache/dev-python/async-0.6.1-r1
@@ -59536,7 +59570,7 @@
 1305150112 metadata/md5-cache/dev-python/cl-0.0.3
 1305220942 metadata/md5-cache/dev-python/guessit-0.5.4
 1305150112 metadata/md5-cache/dev-python/beautifulsoup-4.1.3
-1305220942 metadata/md5-cache/dev-python/beautifulsoup-4.2.0
+1305222306 metadata/md5-cache/dev-python/beautifulsoup-4.2.0
 1305220942 metadata/md5-cache/dev-python/apipkg-1.2-r1
 1305150113 metadata/md5-cache/dev-python/pystatgrab-0.5
 1305150113 metadata/md5-cache/dev-python/minimock-1.2.6
@@ -59763,7 +59797,7 @@
 1304020906 metadata/md5-cache/dev-python/xhtml2pdf-0.0.5
 1305220942 metadata/md5-cache/dev-python/h5py-2.1.2-r1
 1305220942 metadata/md5-cache/dev-python/pyamazon-0.65
-1305220942 metadata/md5-cache/dev-python/html5lib-0.95-r1
+1305222036 metadata/md5-cache/dev-python/html5lib-0.95-r1
 1305220942 metadata/md5-cache/dev-python/py-gnupg-0.3.2-r1
 1305150112 metadata/md5-cache/dev-python/cddb-py-1.4
 1305150113 metadata/md5-cache/dev-python/pywebkitgtk-1.1.8
@@ -59878,8 +59912,8 @@
 1305220942 metadata/md5-cache/dev-python/lxml-3.1.0
 1305220942 metadata/md5-cache/dev-python/lxml-3.1.1
 1305220942 metadata/md5-cache/dev-python/lxml-3.1.2
-1305220942 metadata/md5-cache/dev-python/lxml-3.2.0
-1305220942 metadata/md5-cache/dev-python/lxml-3.2.1
+1305230206 metadata/md5-cache/dev-python/lxml-3.2.0
+1305230236 metadata/md5-cache/dev-python/lxml-3.2.1
 1305220942 metadata/md5-cache/dev-python/ijson-1.0-r1
 1305220942 metadata/md5-cache/dev-python/pyparsing-1.5.6-r1
 1305220942 metadata/md5-cache/dev-python/pyparsing-1.5.6-r2
@@ -59929,7 +59963,7 @@
 1305220942 metadata/md5-cache/dev-python/boto-2.9.4
 1305150112 metadata/md5-cache/dev-python/django-pipeline-1.2.6
 1305150112 metadata/md5-cache/dev-python/django-pipeline-1.2.9
-1305220942 metadata/md5-cache/dev-python/django-pipeline-1.3.9
+1305222036 metadata/md5-cache/dev-python/django-pipeline-1.3.9
 1305220942 metadata/md5-cache/dev-python/pyGPG-9999
 1305220942 metadata/md5-cache/dev-python/python-gnupg-0.3.1-r1
 1305150112 metadata/md5-cache/dev-python/billiard-2.7.3.18
@@ -60035,6 +60069,7 @@
 1305150113 metadata/md5-cache/dev-python/xlrd-0.7.7
 1305150113 metadata/md5-cache/dev-python/xlrd-0.8.0
 1305220942 metadata/md5-cache/dev-python/xlrd-0.9.0
+1305230836 metadata/md5-cache/dev-python/xlrd-0.9.2
 1305220942 metadata/md5-cache/dev-python/spyder-2.1.11
 1305150112 metadata/md5-cache/dev-python/hcs-utils-1.2
 1305220942 metadata/md5-cache/dev-python/hcs-utils-1.3
@@ -60149,6 +60184,7 @@
 1305220942 metadata/md5-cache/dev-python/ipython-0.12-r1
 1305150113 metadata/md5-cache/dev-python/pyconstruct-2.04
 1305150113 metadata/md5-cache/dev-python/pyconstruct-2.06
+1305230536 metadata/md5-cache/dev-python/jinja-2.6-r100
 1305150112 metadata/md5-cache/dev-python/joblib-0.7.0d
 1305150112 metadata/md5-cache/dev-python/empy-3.3
 1305150113 metadata/md5-cache/dev-python/python-cdb-0.34
@@ -60159,6 +60195,7 @@
 1305220942 metadata/md5-cache/dev-python/pyliblzma-0.5.3-r1
 1305150113 metadata/md5-cache/dev-python/oct2py-0.3.6
 1305220942 metadata/md5-cache/dev-python/flask-0.9-r1
+1305230506 metadata/md5-cache/dev-python/flask-0.9-r2
 1305220942 metadata/md5-cache/dev-python/python-bibtex-1.2.4
 1305220942 metadata/md5-cache/dev-python/python-bibtex-1.2.5
 1305220942 metadata/md5-cache/dev-python/enzyme-0.2
@@ -60237,7 +60274,7 @@
 1305220942 metadata/md5-cache/dev-python/etsprojecttools-0.6.0-r1
 1305220942 metadata/md5-cache/dev-python/xlwt-0.7.4-r1
 1305220942 metadata/md5-cache/dev-python/pyqwt-5.2.0
-1305220942 metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
+1305230206 metadata/md5-cache/dev-python/beautifulsoup-3.2.1-r1
 1305220942 metadata/md5-cache/dev-python/pygobject-3.4.2-r1
 1305220942 metadata/md5-cache/dev-python/sleekxmpp-1.1.11
 1305150113 metadata/md5-cache/dev-python/snakeoil-9999
@@ -60252,7 +60289,6 @@
 1305220942 metadata/md5-cache/dev-python/python-swiftclient-1.2.0-r1
 1305150112 metadata/md5-cache/dev-python/inotifyx-0.1.1
 1305150112 metadata/md5-cache/dev-python/inotifyx-0.2.0
-1305150112 metadata/md5-cache/dev-python/cython-0.14.1-r1
 1305150113 metadata/md5-cache/dev-python/progressbar-2.3
 1305150112 metadata/md5-cache/dev-python/flask-sqlalchemy-0.15
 1305150112 metadata/md5-cache/dev-python/flask-sqlalchemy-0.16
@@ -60283,7 +60319,6 @@
 1305220942 metadata/md5-cache/dev-python/peak-rules-0.5
 1305220942 metadata/md5-cache/dev-python/librsvg-python-2.32.0
 1305150113 metadata/md5-cache/dev-python/python-irclib-0.4.8
-1305220942 metadata/md5-cache/dev-python/cython-0.15.1-r1
 1305220942 metadata/md5-cache/dev-python/http-parser-0.8.1-r1
 1305220942 metadata/md5-cache/dev-python/pyside-tools-0.2.14
 1305220942 metadata/md5-cache/dev-python/rarfile-2.6
@@ -60317,6 +60352,7 @@
 1305150113 metadata/md5-cache/dev-python/py-1.4.11
 1305150113 metadata/md5-cache/dev-python/py-1.4.12
 1305220942 metadata/md5-cache/dev-python/py-1.4.13
+1305230936 metadata/md5-cache/dev-python/py-1.4.14
 1305150113 metadata/md5-cache/dev-python/ujson-1.30
 1305220942 metadata/md5-cache/dev-python/amqplib-0.6.1
 1305220942 metadata/md5-cache/dev-python/html2text-3.200.3-r1
@@ -60349,7 +60385,7 @@
 1305220942 metadata/md5-cache/dev-python/pythonmagick-0.9.8
 1305220942 metadata/md5-cache/dev-python/psycopg-1.1.21-r1
 1305150113 metadata/md5-cache/dev-python/pymad-0.6
-1305220942 metadata/md5-cache/dev-python/flask-9999
+1305230506 metadata/md5-cache/dev-python/flask-9999
 1305220942 metadata/md5-cache/dev-python/sqlalchemy-0.7.4
 1305150113 metadata/md5-cache/dev-python/sqlalchemy-0.7.5
 1305150113 metadata/md5-cache/dev-python/sqlalchemy-0.7.6
@@ -60518,6 +60554,7 @@
 1305220942 metadata/md5-cache/dev-python/sphinx-1.1.3-r3
 1305220942 metadata/md5-cache/dev-python/sphinx-1.1.3-r5
 1305220942 metadata/md5-cache/dev-python/sphinx-1.1.3-r6
+1305230506 metadata/md5-cache/dev-python/sphinx-1.1.3-r7
 1305150113 metadata/md5-cache/dev-python/python-musicbrainz-0.7.3
 1305150113 metadata/md5-cache/dev-python/python-musicbrainz-0.7.4
 1305220942 metadata/md5-cache/dev-python/pygraphviz-1.1-r1
@@ -60652,7 +60689,7 @@
 1305220942 metadata/md5-cache/dev-python/ws4py-0.2.3
 1305220942 metadata/md5-cache/dev-python/ws4py-0.2.4
 1305150112 metadata/md5-cache/dev-python/jinja-2.6
-1305220942 metadata/md5-cache/dev-python/jinja-2.7
+1305231736 metadata/md5-cache/dev-python/jinja-2.7
 1305150113 metadata/md5-cache/dev-python/twistedsnmp-0.3.13
 1305150113 metadata/md5-cache/dev-python/pysfml-1.6
 1305150113 metadata/md5-cache/dev-python/pylast-0.5.11
@@ -60728,6 +60765,7 @@
 1305150112 metadata/md5-cache/dev-python/cliapp-1.20120929
 1305150112 metadata/md5-cache/dev-python/cliapp-1.20121216
 1305150113 metadata/md5-cache/dev-python/pylons-1.0
+1305230306 metadata/md5-cache/dev-python/python-memcached-1.48-r1
 1305220942 metadata/md5-cache/dev-python/cliapp-1.20130313
 1305220942 metadata/md5-cache/dev-python/vo-0.8
 1305150113 metadata/md5-cache/dev-python/logilab-constraint-0.4.0
@@ -60831,7 +60869,7 @@
 1305220942 metadata/md5-cache/dev-python/pyzmq-2.2.0.1-r1
 1305220942 metadata/md5-cache/dev-python/translationstring-1.1-r1
 1305220942 metadata/md5-cache/dev-python/jinja-2.6-r1
-1305220942 metadata/md5-cache/dev-python/jinja-2.6-r2
+1305230536 metadata/md5-cache/dev-python/jinja-2.6-r2
 1305220942 metadata/md5-cache/dev-python/pyorbit-2.24.0
 1305150112 metadata/md5-cache/dev-python/cssutils-0.9.9
 1305150113 metadata/md5-cache/dev-python/pyasn1-0.0.13
@@ -60954,6 +60992,7 @@
 1305220942 metadata/md5-cache/dev-python/twisted-mail-13.0.0
 1305150112 metadata/md5-cache/dev-python/cython-0.16
 1305150112 metadata/md5-cache/dev-python/cython-0.18
+1305231236 metadata/md5-cache/dev-python/cython-0.19
 1305220942 metadata/md5-cache/dev-python/Djblets-0.6.22
 1305220942 metadata/md5-cache/dev-python/Djblets-0.7.14
 1305220942 metadata/md5-cache/dev-python/pypy-1.9-r1
@@ -61188,7 +61227,7 @@
 1305150113 metadata/md5-cache/dev-python/pywebdav-0.9.4.1
 1305220942 metadata/md5-cache/dev-python/setproctitle-1.1.6-r1
 1305150113 metadata/md5-cache/dev-python/unidecode-0.04.9
-1305220636 metadata/md5-cache/dev-python/ply-3.4
+1305231236 metadata/md5-cache/dev-python/ply-3.4
 1305150113 metadata/md5-cache/dev-python/pylzma-0.4.4
 1305150113 metadata/md5-cache/dev-python/scripttest-1.2
 1305220942 metadata/md5-cache/dev-python/hgtools-2.0.2-r1
@@ -61302,12 +61341,12 @@
 1305150113 metadata/md5-cache/dev-python/ropeide-1.5.1-r1
 1305220942 metadata/md5-cache/dev-python/robotframework-selenium2library-1.1.0
 1305220942 metadata/md5-cache/dev-python/django-endless-pagination-1.1-r1
-1305150112 metadata/md5-cache/dev-python/cython-0.14.1
 1305150112 metadata/md5-cache/dev-python/cython-0.17.1
 1305150112 metadata/md5-cache/dev-python/cython-0.17.2
 1305150112 metadata/md5-cache/dev-python/cython-0.17.4
 1305220942 metadata/md5-cache/dev-python/astng-0.24.1-r1
-1305220942 metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r1
+1305230206 metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r1
+1305230236 metadata/md5-cache/dev-python/beautifulsoup-3.1.0.1-r2
 1305220942 metadata/md5-cache/dev-python/chaco-4.3.0-r1
 1305150112 metadata/md5-cache/dev-python/audioread-0.6
 1305221436 metadata/md5-cache/dev-python/pyro-4.17-r1
@@ -61346,6 +61385,7 @@
 1305220942 metadata/md5-cache/dev-python/setuptools_hg-0.4-r1
 1305150113 metadata/md5-cache/dev-python/platinfo-0.15.0
 1305220942 metadata/md5-cache/dev-python/ujson-1.30-r1
+1305222006 metadata/md5-cache/dev-python/jsmin-2.0.3
 1305220942 metadata/md5-cache/dev-python/symboltype-1.0
 1305220942 metadata/md5-cache/dev-python/pmw-1.3.3
 1305150113 metadata/md5-cache/dev-python/pynotifier-0.7.0-r1
@@ -61420,6 +61460,7 @@
 1305220936 metadata/md5-cache/app-benchmarks/iozone-3.408
 1211091733 metadata/md5-cache/app-benchmarks/dbench-3.04
 1305220936 metadata/md5-cache/app-benchmarks/siege-3.0.0
+1305231006 metadata/md5-cache/app-benchmarks/siege-3.0.1
 1305220936 metadata/md5-cache/app-benchmarks/i7z-0.27.2
 1211091733 metadata/md5-cache/app-benchmarks/volanomark-2.5.0.9
 1211091733 metadata/md5-cache/app-benchmarks/sysbench-0.4.10
@@ -61868,8 +61909,8 @@
 1305221011 metadata/md5-cache/sys-fs/rar2fs-1.16.0
 1305221011 metadata/md5-cache/sys-fs/mac-fdisk-0.1-r6
 1305221011 metadata/md5-cache/sys-fs/mac-fdisk-0.1-r7
-1305221011 metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
-1305221011 metadata/md5-cache/sys-fs/lvm2-2.02.97-r1
+1305231836 metadata/md5-cache/sys-fs/lvm2-2.02.95-r4
+1305231836 metadata/md5-cache/sys-fs/lvm2-2.02.97-r1
 1305221011 metadata/md5-cache/sys-fs/aufs2-2.1_p20110817
 1305221011 metadata/md5-cache/sys-fs/aufs2-2.1_p20111031
 1305150124 metadata/md5-cache/sys-fs/fuse-exfat-1.0.1
@@ -61883,8 +61924,8 @@
 1211091751 metadata/md5-cache/sys-fs/mtpfs-1.1
 1211091751 metadata/md5-cache/sys-fs/ext4magic-0.3.0
 1305150124 metadata/md5-cache/sys-fs/fatsort-1.0.275
-1305221011 metadata/md5-cache/sys-fs/lvm2-2.02.97
-1305221011 metadata/md5-cache/sys-fs/lvm2-2.02.98
+1305231836 metadata/md5-cache/sys-fs/lvm2-2.02.97
+1305231836 metadata/md5-cache/sys-fs/lvm2-2.02.98
 1305221011 metadata/md5-cache/sys-fs/traydevice-1.6.2-r1
 1305221011 metadata/md5-cache/sys-fs/cachefilesd-0.10.1-r1
 1305221011 metadata/md5-cache/sys-fs/sysfsutils-2.1.0
@@ -62446,10 +62487,8 @@
 1305220946 metadata/md5-cache/media-fonts/liberation-fonts-1.07.2
 1305220946 metadata/md5-cache/media-fonts/wqy-microhei-0.2.0_beta
 1305220946 metadata/md5-cache/media-fonts/artwiz-aleczapka-en-1.3
-1305220946 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre040
-1305220946 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043
-1305220946 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre046
-1305220946 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre052
+1305231906 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre052
+1305231836 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre055
 1305220946 metadata/md5-cache/media-fonts/wqy-zenhei-0.8.38-r1
 1305220946 metadata/md5-cache/media-fonts/sil-ezra-2.51
 1305220946 metadata/md5-cache/media-fonts/vollkorn-2.1
@@ -62466,7 +62505,6 @@
 1305220946 metadata/md5-cache/media-fonts/corefonts-1-r5
 1305220946 metadata/md5-cache/media-fonts/corefonts-1-r6
 1305220946 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre030-r1
-1305220946 metadata/md5-cache/media-fonts/mplus-outline-fonts-0_pre043-r1
 1305220946 metadata/md5-cache/media-fonts/sil-galatia-2.1
 1305220946 metadata/md5-cache/media-fonts/nepali-fonts-1-r1
 1305220946 metadata/md5-cache/media-fonts/font-winitzki-cyrillic-1.0.3
@@ -62722,7 +62760,7 @@
 1305220947 metadata/md5-cache/media-sound/jokosher-0.11.5
 1305220947 metadata/md5-cache/media-sound/kradio-4.0.7
 1305150119 metadata/md5-cache/media-sound/ncmpc-0.20
-1305211936 metadata/md5-cache/media-sound/ncmpc-0.21
+1305231606 metadata/md5-cache/media-sound/ncmpc-0.21
 1305220947 metadata/md5-cache/media-sound/muine-0.8.11-r2
 1305220947 metadata/md5-cache/media-sound/edna-0.6
 1305220947 metadata/md5-cache/media-sound/alsa-tools-1.0.27-r1
@@ -63119,6 +63157,7 @@
 1305220947 metadata/md5-cache/media-sound/mpg123-1.14.4
 1305220947 metadata/md5-cache/media-sound/mpg123-1.15.1
 1305220947 metadata/md5-cache/media-sound/mpg123-1.15.3
+1305230606 metadata/md5-cache/media-sound/mpg123-1.15.4
 1305220947 metadata/md5-cache/media-sound/skype-call-recorder-0.8
 1211091746 metadata/md5-cache/media-sound/vlorb-1.2
 1211091746 metadata/md5-cache/media-sound/rip-1.07
@@ -63390,7 +63429,7 @@
 1305220948 metadata/md5-cache/media-video/aravis-0.1.15
 1305220948 metadata/md5-cache/media-video/libav-0.8.5
 1305220948 metadata/md5-cache/media-video/libav-0.8.6
-1305220948 metadata/md5-cache/media-video/libav-0.8.7
+1305231606 metadata/md5-cache/media-video/libav-0.8.7
 1305220948 metadata/md5-cache/media-video/smplayer-0.8.4-r1
 1211091746 metadata/md5-cache/media-video/xvid4conf-1.12
 1305220948 metadata/md5-cache/media-video/makemkv-1.8.0-r1
@@ -63488,7 +63527,7 @@
 1305220948 metadata/md5-cache/media-video/vcdimager-0.7.23
 1305220948 metadata/md5-cache/media-video/avinfo-1.0_alpha15_p1
 1305150119 metadata/md5-cache/media-video/guvcview-1.6.1
-1305220948 metadata/md5-cache/media-video/handbrake-9999
+1305231906 metadata/md5-cache/media-video/handbrake-9999
 1305220948 metadata/md5-cache/media-video/sonic-snap-1.7
 1305220948 metadata/md5-cache/media-video/super_demux-0.3
 1305121136 metadata/md5-cache/media-video/subotage-0.15
@@ -63545,7 +63584,7 @@
 1305220948 metadata/md5-cache/media-video/recordmydesktop-0.3.8.1-r4
 1305150119 metadata/md5-cache/media-video/subdl-1.0.3
 1305220948 metadata/md5-cache/media-video/mplayer-sh-0.8.7
-1305220948 metadata/md5-cache/media-video/ffmpeg-9999
+1305230506 metadata/md5-cache/media-video/ffmpeg-9999
 1305220948 metadata/md5-cache/media-video/mkvtoolnix-5.0.1-r1
 1305220948 metadata/md5-cache/media-video/mkvalidator-0.4.0
 1211091746 metadata/md5-cache/media-video/mkvalidator-0.4.1
@@ -63572,6 +63611,7 @@
 1305220948 metadata/md5-cache/media-video/subdownloader-2.0.18
 1305220948 metadata/md5-cache/media-video/isight-firmware-tools-1.6-r1
 1305220948 metadata/md5-cache/media-video/kamerka-0.8.5
+1305231906 metadata/md5-cache/media-video/handbrake-0.9.9
 1211091746 metadata/md5-cache/media-video/vcdgear-1.76-r2
 1305220948 metadata/md5-cache/media-video/videotrans-1.6.1
 1305220948 metadata/md5-cache/media-video/istanbul-0.2.2
@@ -65963,7 +66003,7 @@
 1305220944 metadata/md5-cache/games-misc/xpenguins-2.2-r1
 1301121306 metadata/md5-cache/games-misc/fortune-mod-familyguy-0.2
 1301121306 metadata/md5-cache/games-misc/fortune-mod-futurama-0.2
-1305220944 metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1
+1305231836 metadata/md5-cache/games-misc/katawa-shoujo-1.0-r1
 1301121336 metadata/md5-cache/games-misc/fortune-mod-smac-0.1
 1305220944 metadata/md5-cache/games-misc/bsd-games-2.17-r4
 1305220944 metadata/md5-cache/games-misc/bsd-games-2.17-r5
@@ -67600,7 +67640,7 @@
 1305150119 metadata/md5-cache/net-analyzer/raddump-0.2.1
 1305150119 metadata/md5-cache/net-analyzer/raddump-0.3.1
 1211091746 metadata/md5-cache/net-analyzer/syweb-0.64
-1305220948 metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc1
+1305232006 metadata/md5-cache/net-analyzer/wireshark-1.10.0_rc2
 1305220948 metadata/md5-cache/net-analyzer/mrtg-2.17.2
 1211091746 metadata/md5-cache/net-analyzer/mrtg-2.17.4
 1305220948 metadata/md5-cache/net-analyzer/firewalk-5.0-r1
@@ -67805,6 +67845,7 @@
 1305150119 metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.5
 1305150119 metadata/md5-cache/net-analyzer/nagios-check_mysql_health-2.1.7
 1305220948 metadata/md5-cache/net-analyzer/etherape-0.9.12
+1305222136 metadata/md5-cache/net-analyzer/etherape-0.9.13
 1305220948 metadata/md5-cache/net-analyzer/sflowtool-3.27
 1305220948 metadata/md5-cache/net-analyzer/sflowtool-3.28
 1305220948 metadata/md5-cache/net-analyzer/nagios-core-3.2.3
@@ -67853,11 +67894,12 @@
 1305220948 metadata/md5-cache/net-analyzer/p0f-2.0.8-r2
 1305150119 metadata/md5-cache/net-analyzer/sbd-1.37-r1
 1305220948 metadata/md5-cache/net-analyzer/pypacker-2.0
-1305220948 metadata/md5-cache/net-analyzer/munin-2.0.13
+1305232006 metadata/md5-cache/net-analyzer/munin-2.0.14
 1305220948 metadata/md5-cache/net-analyzer/fping-3.0
 1305220948 metadata/md5-cache/net-analyzer/fping-3.1
 1305220948 metadata/md5-cache/net-analyzer/fping-3.2
 1211091746 metadata/md5-cache/net-analyzer/fping-3.4
+1305230436 metadata/md5-cache/net-analyzer/fping-3.5
 1211091746 metadata/md5-cache/net-analyzer/openvas-2.0.1
 1211091746 metadata/md5-cache/net-analyzer/openvas-2.0.2
 1305150119 metadata/md5-cache/net-analyzer/xnetload-1.11.3-r1
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 254eca98cd6d..df0a67e00388 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 22 May 2013 12:30:01 +0000
+Thu, 23 May 2013 17:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index eb466fb06ca1..ede6099be8e0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1369224301 Wed May 22 12:05:01 2013 UTC
+1369328701 Thu May 23 17:05:01 2013 UTC
diff --git a/net-analyzer/etherape/ChangeLog b/net-analyzer/etherape/ChangeLog
index 46eef46f9950..0d77e521e900 100644
--- a/net-analyzer/etherape/ChangeLog
+++ b/net-analyzer/etherape/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/etherape
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.67 2012/10/02 19:29:38 zerochaos Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/ChangeLog,v 1.68 2013/05/22 17:10:16 jer Exp $
+
+*etherape-0.9.13 (22 May 2013)
+
+  22 May 2013; Jeroen Roovers  +etherape-0.9.13.ebuild:
+  Version bump.
 
   02 Oct 2012; Rick Farina  etherape-0.9.12.ebuild:
   cleanup a bunch of libGlade warnings by adjusting deps
diff --git a/net-analyzer/etherape/Manifest b/net-analyzer/etherape/Manifest
index f4f9ab0366ef..fe91140f86dd 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1,25 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX etherape-0.9.3-res_mkquery.patch 620 SHA256 468565bde5932f3e177d065a107f491fe00545b00ace371a9e04212dc253208d SHA512 65627ee40dff8ed5d9dedcff641d72379ea3718c66985160db09f6057bd1d73f0e7e0fc0e5e0a3f8b18493d2040a8c4e1e7d7a9fa7dbe8f575f8bee53427791c WHIRLPOOL 8259197700efef49a199309a345358f1ced3e1ead4664edb7bf6ba2882c58ce45e7d1aedf39f81ecaebb67808940f4c8c43395325a8b78510d947bbb2ea8072b
 DIST etherape-0.9.12.tar.gz 1384124 SHA256 9304c70f2727a63420cc8f2bbe3c900caeadb6652dc33c180d4264c1b1029145 SHA512 e8a3f246a556d9c795703b455e1343e191a2cddfc95fb2db72805036716c0cf3708548f3331dc1de236f9bdf4e5d208abaf872a383d2fe0867c3d05d413e6e4b WHIRLPOOL 66266199341447f2d92d6a3ca6edaa807e6f4d7e181a49795135a10350d580c80aa2454a8257d8f910554f60fe01cd86441a49cf37b6a6589ce4759ce92d8a83
+DIST etherape-0.9.13.tar.gz 1399211 SHA256 2a3d2a28b824ce4797529bb90d19a213d80e70f5b3f0cc5f455379aac31c09f7 SHA512 e71b2febb6901a0a3f4629036fd40bc4c30fad48f2e592808499bb2c8af2269d2eb71058f1b00ce05005ef3effe1971033fefffc871346c616ccecc46833d67f WHIRLPOOL cc9bfc59012a97dda7c7624d8ff7c0ef96ffaf724f782e3c406cf86bef38f246468079de2f8f86e21aa3bd148ce9f24963ff70048a242c07e268b6cd390c6770
 EBUILD etherape-0.9.12.ebuild 785 SHA256 b8decb69d73a2fea909d098b2b3e69c7af6cd75b507bcb8a23a243b6ff47ab84 SHA512 98d96a8f3268cc2c15d325f6ed6f212096097fc80ff75516c5315ea6733eff98b835ee57816814610de5e4537dd14b1e84edd8bfde9d7e982d803812574115ce WHIRLPOOL 5fd900c64cb93b29b8bb5c8f4c753768df554d913e29356730b836c26994e4694a511c25f26811861e7cc09c531b620b8682aac37b6a022087f38269a2791dce
-MISC ChangeLog 9675 SHA256 510f391123bdfab8d5af1e675411ec7f2fedb4de5dc52a691da9fb08d3c4eab1 SHA512 08472e91fa0ee7f447434b52573a3763a792f0440262d779af932237cd45ed18e708a16288cd470e5f61ed0eaca8f7abe7a3e8fc096a17682d1fbc3c0c6db09f WHIRLPOOL 422c2c2d45438f535128d847d58d197b4df2d1901348e1128c41962eb1c3b4b58ab994fc4a5ba07c95b3f67c821d731847aae2283ad3c250ee7bcaf642c8ef51
+EBUILD etherape-0.9.13.ebuild 784 SHA256 2637065bfd0c93c26eaceb69eaab94573fa59c810f531875611da9e4d3652339 SHA512 6a8b5fe1949b41e5335a00fe1a61daa8641a4e36a0af2436b486a734f19cfeae0f246a46afb2232edf9364328bb55f6ec9c2520b7cf1fc63f101e99178ddab67 WHIRLPOOL f11932c39a26e731bcec805a06ec9657ab3c3bb9cc51e298f375ce1464d599b66b666494fcf3e98cd8eaf0b3a686abcf2a860fa1e35794fab5f44e8606767a08
+MISC ChangeLog 9790 SHA256 13c35bf352a63c02529deba7cf7e516082c93eb88474d664f4eae97667b56f4d SHA512 5e5eb3086785779f1d41b7aa7c1822420821e7b6f3aebd075c3e3cd4a38650617401c15b423c11e8847ac2d776fbea653bcc0f80b5c1740312c57242a99d3d67 WHIRLPOOL 20125dfd13ee6d2b0fcd27cd32fca1e48b5e430cf59400a1a58054f428d3852f9f6c1a6ca6bf1bb8abd3d32b553f0113bde3ef1a1ec4a74c4f8adf9df5a4dd74
 MISC metadata.xml 621 SHA256 24acd07cf59238e01dca25439d05e18f5fa47ad26fe6c387a4a56e6ce1d7e612 SHA512 d48b2778ec8b749a566c27f002f4ed5618eacce760046ba0e802894f55e8b3a65ee43cb2374dd635225d9df858a0ecdd5ba0d0dd5be806f7dec407ec68b33496 WHIRLPOOL d40cd5afb969a17193822d96c1fa298a99bcf85df8c224501836697af8b1ab7d7e421257a0c5a682e5eb898bc6c64e2086503eb0944126c4f56426ebce72e055
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJQa0DMAAoJEKXdFCfdEflKbLYQAJkexu2J3rAvttCLNLI2/5lt
-GnE1lQv6DSk3Y/9llZPeyNsuVvY7TNY/N//mcReQlzRSfRtxtzOg0vm8qceNDY0k
-AqU05TLrwGWhEsQSP9JW62hsDY7jrOoiFIp3V3XKvzMcMpNaUw7irqwvmXLkfWDX
-tfevDjb3wSDpYebT3kq8rUVAY6g8pMkQw5AF9CVluvhDtkhttDgBf/UjEkqLBUIy
-JuyYzEDilAAKpWxUw521ME4OGsOrzWz3fZ1sa9KKUIOTlOmz1bMyC+sru/oUclGo
-tVkN67M1tlwHP8PyrmpD3hcO8cD71GeLhRgVa81i4nAzTjmJmb/uVmcnse9+cBGS
-12fvWLMHFhE9SylRoF2Pfkb4RMpFvKT/bSTcP3qrvTWkbQpLcIXsYGzCxO00TQ6y
-BR5ZHtg1ZvYAwPACC1vf9Rf35jFQh58QxDS8MpMIWGQAXIxF+f9MxX+3beFT8HPh
-uOi2JNHdXPYgNjZ0utUrxRYDPTZ+Q2l/Eov2QIlKlRS5wjSIyfKjjVO5GihYlMRW
-CsjNBy+1zWd6MSlY5Y6wJOlCaOuzD4JHSwrhI7yGEfHsgMEmlYyrqZfSNk8T7xP6
-Wy+10u5OuN+pj287QTn3qD1G2nM4XGjjuI/kTAygTVR5L0cQzOz3RSZdPCo+FKOw
-k3QXwBBgUyMcj4v+GFEI
-=X9MV
+iEYEAREIAAYFAlGc+/oACgkQVWmRsqeSphPMkwCfTLnUfj9EnY8I3NlQOKghNBvF
+kPgAnAmjr1tVt/yMbnMe/mIZk6RoOnfG
+=WkBt
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/etherape/etherape-0.9.13.ebuild b/net-analyzer/etherape/etherape-0.9.13.ebuild
new file mode 100644
index 000000000000..0eed02f022b1
--- /dev/null
+++ b/net-analyzer/etherape/etherape-0.9.13.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/etherape/etherape-0.9.13.ebuild,v 1.1 2013/05/22 17:10:16 jer Exp $
+
+EAPI="2"
+inherit eutils gnome2
+
+DESCRIPTION="A graphical network monitor for Unix modeled after etherman"
+HOMEPAGE="http://etherape.sourceforge.net/"
+SRC_URI="mirror://sourceforge/etherape/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+RDEPEND=">=gnome-base/libglade-2.0
+	gnome-base/libgnomecanvas[glade]
+	>=gnome-base/libgnomeui-2.0
+	net-libs/libpcap"
+DEPEND="${RDEPEND}
+	app-text/scrollkeeper
+	>=sys-devel/gettext-0.11.5
+	app-text/gnome-doc-utils
+	virtual/pkgconfig"
+
+DOCS="AUTHORS ChangeLog FAQ NEWS README* TODO"
diff --git a/net-analyzer/fping/ChangeLog b/net-analyzer/fping/ChangeLog
index d040fbf78465..915a88fe9394 100644
--- a/net-analyzer/fping/ChangeLog
+++ b/net-analyzer/fping/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-analyzer/fping
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.53 2012/09/06 01:34:15 blueness Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/ChangeLog,v 1.54 2013/05/23 00:03:18 radhermit Exp $
+
+*fping-3.5 (23 May 2013)
+
+  23 May 2013; Tim Harder  +fping-3.5.ebuild:
+  Version bump.
 
   06 Sep 2012; Anthony G. Basile  fping-3.4.ebuild:
   Keyword ~arm
diff --git a/net-analyzer/fping/Manifest b/net-analyzer/fping/Manifest
index de8c870d1778..373f5d526820 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -6,6 +6,7 @@ DIST fping-3.0.tar.gz 131436 SHA256 380a73a086bba4eebcaf6275dc065f587359a122849f
 DIST fping-3.1.tar.gz 138134 SHA256 e5c9d3984a8680c4f0a40d1b2b534276caffc92c1da4a27ea35894a94be2b999 SHA512 f264eacb8055f8a7dc8acee63e1fef94b91909bf2dc67827fc8b0ab8ff677d4a1c7d9b9a2d8aa3e5e651503ac70351de5d8caf841b41d62bf82d5f21ea22329c WHIRLPOOL c74ed999747996fe71144d6e974b709951e3dbee8c756498c73e5d0989dcfcbbae618bb45aaafef825e21cb7022f9c42449fdf60e89e37d30f5c50ac3cc910d9
 DIST fping-3.2.tar.gz 137967 SHA256 b26739a1fa3471775ff1958a1e3d7597f12c9eb56429c29cf956e52f5046e2c1 SHA512 2e879ab442964093286a0460d912266f1d0157f4f9f1e289248dc60addf37b8e1aa712d4b9d6ce889fd36b2eced6fd8361c199fd43fb6618a1e25c2ce4307508 WHIRLPOOL 2de51d478b7d91b2c77c8046781e091ecceb9031bcaea9c5a9c562981a3a89a0596c2ea57e8a0014d1e9c3c400afb824dac0dd070e0ce41dc7432d7b2d86df85
 DIST fping-3.4.tar.gz 142986 SHA256 d42528af4931f16a8e3438bd4a45cfdd72163ad8835a3c95351c336a26e56afe SHA512 f9580c5537550738b316aa2ed50408035ab3dca789960c58414687f0aa253dcafaa751009bed417e6c11ec97f02bdf4d21c57f5b0f655cd28eccecb1107192a2 WHIRLPOOL 75dc41cc9983ff45f0e84c820b8d67dab56effd2f6e0aee7c4a21e96269312caf393b6c94b52eac971a95cbcdf828a96477ad0492909408f5dfaf94185579e17
+DIST fping-3.5.tar.gz 145512 SHA256 09b8960e235341bae6000085d38106357eae656a79e0119bd27e816c9003656a SHA512 db36e74a5051de32245c2d96289d238ae2ae6698a5215c83401ed3b5bca2784c7d09bff2686f696990b31063fea8c1a5d2f2e15c09f808a1012992a1349db8f5 WHIRLPOOL 4c7263fa84ad50b40deff8fa54a433a475f8e28aeac3b01e9c12ca3cfc2f47f950f1163d1604f24bcbfee755f1a092e9f5cb1fa980cdbf571fd42b4e14aca2c4
 DIST fping_2.4b2-to-ipv6-16.1.diff.gz 8488 SHA256 de0021aba41ba6b1b98d34fb98f99bfd55455d332ed6aece83690e2d93159e6e SHA512 6af25324d159df4ddd7dd909e2e1a0d85e08c2f51c31469960c2dbc7a9eb4967fd114eb87361f8c6b1691de60e7f753d371e6c902bec706f3fed3d205fbe49f0 WHIRLPOOL 5bb9fdf9fba3769985d34d2e06b2e28540e997a00eb84d7b5a6d71e4cfe4f7a3b50933981df291df5141b8f43729375c95ceb9009cafbcf234c1f50cb89cf232
 DIST fping_2.4b2-to-ipv6.orig.tar.gz 63333 SHA256 77e1a90af4fff4a5ffc4b70542c6ff44130558357e7d549f99a9eff23108d172 SHA512 3d1a76680d3a7cd361481d6e6de49797fbaf01422a73c784c8b667131afd56de2bfbbeb17014047cd2dea903f87d9f19e38ed7b0a5c2e8f2faf82759bf064ff9 WHIRLPOOL a1b0ce998004aea349a04a67a1430b2331292f1c4cb03fdee4d1b579e36c93c9852ed676f450fecdeb22690b2aee18b0319b0c193d794684d195cb73fa62697b
 EBUILD fping-2.4_beta2_p161-r1.ebuild 1440 SHA256 cb96b05044d4853156fd39fd2077212aed79c574c7605d9df462227b834e220d SHA512 487b8ea6462a7706307532b65fb00d2a35534e2f64d7fd23ee42c05b234ed0b0c2ef54f2df35d02ae5f3025df5c3ff628a2148f86d96c74a55a8af0ac0fe166e WHIRLPOOL 5776a7f71e276e50a0dd01e33ff7ec16ff558bac7355ed6aae24198d847920e06ebc0f99137faed7bdbf8f78b4fcbcb0617f6f814da33c6f545ef1ab6b2ae50e
@@ -13,12 +14,17 @@ EBUILD fping-3.0.ebuild 963 SHA256 3dfdf546a5e3340f16a8b77ce5f1f3053ffbb8aa045a4
 EBUILD fping-3.1.ebuild 981 SHA256 0082907d3f841cd76862b1b372fce93e3acc774b3703c48d2d07bd40e7bf735b SHA512 32b1ef34e4eded8964305a8f15a3eed650d81591c2c0cf58d1a48d58fa05a3075af0483987885209ef92ae3a1a79b4a1aa4db0d7c0dfa2863d3c15e5fc945c0d WHIRLPOOL 413340f99177693028ea21435a6fbd5ce5d9f91dd4d36d5ee37a6ae6b2630685e8cd29fd76776667848d238c7e6b158b4548ecf3003b0fd6ac8fca1e3efa8a3f
 EBUILD fping-3.2.ebuild 990 SHA256 84f1dffaaf595c155991b6901a26c135bdd83fdd81d1ba0525f32eba05c79d2b SHA512 418fa6f84592b1db32f37cf7e1629015569820357a39507d77fe285c03434051dc881c00ce6826c90690f0f99e2ea923ef970551ec44ba87f036ce2f490e8e82 WHIRLPOOL 72f01a602b3bcd4b1407282c491f49b8bcc05039cffdc240e216aa0b6835b025cc283a0f1ff2988f55b1e2abf9609db68616894a697ebe22f7b25cabf01fb478
 EBUILD fping-3.4.ebuild 694 SHA256 a1f245d9ce956c51617b754d386740f5af7a724a52ffc3c0dd09f142b37dba7b SHA512 0e77cf8c49ab3a712808d1fc3d25c94f3868bcdc5e80306a0ae7e865d1ddc8c699a7fb14924c64362f156bb959527461a2b0727cf14943c3dafc5d664f0809ce WHIRLPOOL f2143f549a257f3cf24eae7594efc0d81fb3741eab21c3e218076c60ef8da8f1fa59068f125854763b3e19755b2dbf574ca1db2fb237a2f8428748eb13ebf53d
-MISC ChangeLog 6663 SHA256 20c5607eecf7c0ac97d628279ea477112d5919d308413ece28d1a02bb29a8961 SHA512 173872db3a2d294d2f3c1501bf5ddf145946b33fb743e76d9c221e49cc96abbb1fa9d07fd67f7b6a1eeeb266fe36907f9f77f1aa9a5614dbfbb065b773e2df86 WHIRLPOOL ab347ba3a286a661bc2afec89b626665c8847bf131cb132d43cb12446a2e47a948eaff0d69a8a05bfdb14922172796f9e56a713057984818f3bd59f924479fd6
+EBUILD fping-3.5.ebuild 695 SHA256 3e62d15dc5e75204bcb7959129cceab7436fd4c595f1d8d62a7408a9f5fc1638 SHA512 e52de1b22c636ce547821b8d6d6dc22d2d8fc45e327e3a1d09f00902fcbdb2b69e77d6c63f76774e6f30b2067841d0cb623ab7f91be384629a6239d5b21cefd3 WHIRLPOOL f8644db61dcf89f99d1809a8e194045711a5e487a06e4b0ad93b25ea95cf62fdb2ada935873e3359dce9c182da39d641e3686b836a8d7848bfb7ae870cd94572
+MISC ChangeLog 6775 SHA256 75a81bacca0f95b349bb3dc81c4790970dcfa9ec61c43c39915d98dfccd730c9 SHA512 141924a9d3e1bf05c4d33cbb0bb81e63f0c2d8c03a384866f5b2e6caddfee5aef92754a708a8cb08e75d41bc91c6cb6c228a043c8f75222f1c3957d3ece52359 WHIRLPOOL dcd4493345c9e57c455a810c15dd11f5fd9465c2c6c6ef55435a7c884e57c2e80474333546ab371b8fa4d6f278be64167afced277f1c56899f96f50c5c7dbbc0
 MISC metadata.xml 235 SHA256 f69f7fcaf748f3ad0282cdbbd476c8199178e2dec5ce333b313826d584ed3948 SHA512 23f081e9672c1acab77e0570b27383c1ab1d3ea52262bc4ebfde04b28c86d928641512d1e4fc070b1efac103dd449d26b420c0dd11f5053521b1820cfef2b39a WHIRLPOOL 4be0fdb53f27b4f636c5f89a66c0a79fbb1e9a3ed0b48820b830fda1a7c4df03e11639f77656e1b556cc4aa857cf1e5f06194378416489a4fba6c0e57b8fc06b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlBH/YUACgkQl5yvQNBFVTWwGQCcCH628QbMPzD/c7V8R8FcHwn4
-x6wAn0FT/d4sKCKZp5Bkj7qk2gyUNB2W
-=5ueU
+iQEcBAEBCAAGBQJRnVzJAAoJEEqz6FtPBkyjO00H/RbqAvuTP0AoNAK4oNaWxaAw
+9OhlKZQ0JpWhfe80aIcuGufLtgtpAQqZuPdz5VDlzbNPyj/e22Knq1pEzy7zVFfH
+kCGOniG2IsGZvTVFL7RJfBGEm+J0t4T+uE3sa1Pgn3R0dDI3PFlF641ExjkIPN9e
+XN2n4FBddowPcl6sjq3OMVtCJu0LqTpHGyskbhPeZ1fs4kTt4O/OsGGNRnt1OOBc
+HJhbrPgnjzxDzZVyji8d6HKmBJLcOqrSvgb7Iz/wjQeuzwZ+OdbqLEaf0GQPP6TG
+pBeTjlO+W6T0+0L46TS4vnIAqGVeeifL7nPD8ff0jShxHK4hToOARoTrufa7jiM=
+=rWbJ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/fping/fping-3.5.ebuild b/net-analyzer/fping/fping-3.5.ebuild
new file mode 100644
index 000000000000..4ad20fc271de
--- /dev/null
+++ b/net-analyzer/fping/fping-3.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/fping/fping-3.5.ebuild,v 1.1 2013/05/23 00:03:18 radhermit Exp $
+
+EAPI=4
+
+DESCRIPTION="A utility to ping multiple hosts at once"
+HOMEPAGE="http://fping.org/"
+SRC_URI="http://fping.org/dist/${P}.tar.gz"
+
+LICENSE="fping"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x86-macos"
+IUSE="ipv6 suid"
+
+src_configure() {
+	econf $(use_enable ipv6)
+}
+
+src_install() {
+	default
+
+	if use suid ; then
+		fperms u+s /usr/sbin/fping
+		use ipv6 && fperms u+s /usr/sbin/fping6
+	fi
+}
diff --git a/net-analyzer/munin/ChangeLog b/net-analyzer/munin/ChangeLog
index dc2d6659d91d..a61698944759 100644
--- a/net-analyzer/munin/ChangeLog
+++ b/net-analyzer/munin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/munin
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.141 2013/04/28 19:29:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/ChangeLog,v 1.142 2013/05/23 15:33:19 flameeyes Exp $
+
+*munin-2.0.14 (23 May 2013)
+
+  23 May 2013; Diego E. Pettenò  +munin-2.0.14.ebuild,
+  -munin-2.0.13.ebuild:
+  Version bump.
 
 *munin-2.0.13 (28 Apr 2013)
 
diff --git a/net-analyzer/munin/Manifest b/net-analyzer/munin/Manifest
index 89498433328f..e485d4c3c1c1 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -11,24 +11,24 @@ AUX munin.apache.include 604 SHA256 5051ff79220e5ef578e6e5fa66ef8b0a71b72cca6fde
 AUX munin.apache.include-2.4 577 SHA256 21245e9eb7b759d2d2e65c2d1424da6d8c6fd8f49ec2f30cf72696cfc4227694 SHA512 b07791a4d5b822b5d0ad84ddbea3444cc1475cee8ee20f62dbb5f3a1792b71dba995e412433d30b3c295e40ad5346528d25e04438ec2dfa535983aae9198cea4 WHIRLPOOL 90a166f400e8336792fabcbcb786169dc5ed6b5fe9151ac5aef40f85c8d3f2724a6fffe17e41d90f31948a9462fc619fe45747caf8f62d55f6d494d48a7a2bb1
 DIST munin-2.0.11.1-gentoo-1.tar.xz 10888 SHA256 1ca8f98de51a7779622fbfc708bbf8f76797dca99fddd825366c93a9fe3c5bda SHA512 fdcb19b7933c6f0d980ef6d6ca2abe3cf8fb5a8abcb4a03044f5ff4f0775a9d1609c55aece2be88832c20d607e97ba816c5af0635b7ebab793357211e379bf63 WHIRLPOOL 5d7b31a433dc7514393b8b52780d3e8384238d91f16a6d12d0fee106f1e8f7a20d12ff04c83699fdf6dc183c78b37bdf2d9c0f77710e6c2b3948fb8d361f41da
 DIST munin-2.0.11.1.tar.gz 1331839 SHA256 89ac6a46e82471206c37ed11a9fe2023cbf4c7482517f70a67d5aa5f32366c18 SHA512 969bd2132843f5458b98817837f8bd1ded088268be7bf960dc25a36d70ac6f72ac3063f26ad233dce821342550c9fa4a0502d9ece750a097efe7f94af9bb82e2 WHIRLPOOL b505495dbc3bfcbb6ec1f715aa5752554eb2b1b96006ade81ad2c585e077e5556338532c0175da57d223780d0d79cca45d63e2e33f640ece365c6e43e361ec03
-DIST munin-2.0.13-gentoo-1.tar.xz 10900 SHA256 45b57a0472d93a2d1d6b5eeab93505d499ccddb2a6d7a4570ee645eaba8a19e2 SHA512 2c582f36ecb6b374c42be91f69ab547a8ace4043d43258965cfdcf368ff0e6f13edd522b1e3390757a32075c7ac09d02207be38b04290958630e1f60e63428bd WHIRLPOOL f28ed5bd9b9cf195ed83eea016a3b8a503b33f9ea504fb335fefcfc6e622d8a122b19b7c80d395c2dd9ab3264779dd57a2fae627829928320c180a95ae3751a0
-DIST munin-2.0.13.tar.gz 1333690 SHA256 9a0b74c55a2d846371ad911f9e1102d21a6d39160771e7734981640fd75668db SHA512 267c9ed4bf7631c3890395bfdd77e537a5e7e0f3a395143e4639dee7961e14160cb05bb66ce4515f8bdbbd1426ba69860890deb8df2d7e60e5e130b72cee9bcc WHIRLPOOL 2e5b3a2580a1e667224be85a65c1030d5d874d8c1249ae36b56de23bd324fbeeb4d58d35ae892fc6be3daf647af054fa048c9ef13288a18b0c1091007b1b17ac
+DIST munin-2.0.14-gentoo-1.tar.xz 10892 SHA256 ff105198ce12fa8a1d1ca48edaa402b20201e3b522c6a480285f6cc59a1d6159 SHA512 ecf60c13a751b71b06ec9f00c09197f5f41a17fe7f773fa1d56ce56bedea9feb070d614d91e4d9d77359ac1f090c52b7274342ed27c465e547d4a70479673ae4 WHIRLPOOL adc0bdc5768cc73bd53843c417f540fe0db2f299d1a67e88b3ac6066415dbfdb9b907013b4b0da007fe3ea6443b016b872c9152043f0b20d3fc53786d3fd8ba5
+DIST munin-2.0.14.tar.gz 1333774 SHA256 7526c7a582dd1ede3c7e78e2b0d9fc19240b289b402feeabe495df1ee70b0dbe SHA512 59c259231bbd460578caada30c751095ded0f15d352f5c25d568734f8e24e58c151c6dc2db6cf15872765354d0e03dc8110953d039cc7b73c76481a3aa44cf47 WHIRLPOOL 88299c3b2ebbeda8bb137b116e57d3e2cb076ff37ca0655a09a78f8068dbc3133225bbf45911252f88e493a5ebc39527218b414b28bac482a5266ae0ffd62ce7
 DIST munin-2.0.8-patches-4.tar.xz 16600 SHA256 badd20ae9d7d74667b6a96764c8caaf156e34aa22be5bb08c10535270a99f3d3 SHA512 81084c9b46127f425c89ff76a0c807bbc36859b2fd7ac37734bd202cae92610333f4793aa4630595147d96ad9099da99283c7bcf107351d6ec4931e64451a415 WHIRLPOOL 7e7aed4f0e23f88b0fa2eba548af5573d3e1fab20a910a8568c641ae539c58acc9e020eec01a3323243d6f6ae6f69dd7200818df3a14b5ca3b7100557fc4c8dd
 DIST munin-2.0.8.tar.gz 1328805 SHA256 ae645daee35214c1ba3d771d990fa781df741751b7b79e9d9fe48c583890dca6 SHA512 f767e586aee68c389ce0ae250376bc43d6bfe73df8e193bb7ba8b373d887301e0c1d3574c3fe456be3b93dc86cc8ec8ce27e3c36836a0048b80afb55a3a3cc1e WHIRLPOOL 312f006c21af98f5d9e548a77d43fe7396dcc69072e06faedb3d8262e70599da91bfecdfd06e859d6ff8706506e73308cbcac38e658a28e428fd50399f3f3c3e
 EBUILD munin-2.0.11.1.ebuild 11876 SHA256 e4d6c2481baf88a76082de3ae72aa5a759e6c36222cf7efb279ddf2c7ada459e SHA512 cbb47948d4d2a287ff07f205417f1a10df36fa7adb5aa0ec1b094e39a5341ea639a33db3b6ff96ffeecf04830f6b84051bfe075fcb2c8afa8e2a8eecea895271 WHIRLPOOL f0972d4c7954afc66bb4c0700ad632cb4844642babf5bda7d5248eefe3b4ca6ea173b689a759b3e7aa062cb4ba696bb480c826257096eac4a49cd215d047d998
-EBUILD munin-2.0.13.ebuild 11883 SHA256 efbe840b5d0dd5324b7871a54164471fe82b5cb468157152689d33998b31cc06 SHA512 148c6d8dff20b837c61a9a3c668281dad71913cab9ecc7170cc5da0900112569c585d03beaba9c46d0aa2057b09668fdf4d8f6ba7e051f3e7ee5e7d2b2d3b897 WHIRLPOOL 5a7b292ac01559131a9d838e91f99f2b86fe274563a40f2dadb49b6ca576a36f0285536ad460dcfb18d5a4828c76514e55a74d84fb75495b7defb9daad82712c
+EBUILD munin-2.0.14.ebuild 11883 SHA256 d23d6c45633cf02dec44b379a8049accd5be97299d47d08a2a193ea491ab647f SHA512 bd5b03f0cf6bcdfacad0cde29e8f6a0cd05f85fb7d5e6fd828bd3b38d89167681c53c56adbb366c862ca1226fc5e3aa03d0b6d9235ded2f5e5464fb20875cdff WHIRLPOOL 4d57a167da36025a82531f1ad93b2ab92a63192cc99b0e593eb0b89bf5ed83762c697ec588f5d07e8631ffd9033c95afb31d01f264a0fef4be08aa7612c3d90b
 EBUILD munin-2.0.8-r2.ebuild 11318 SHA256 d37a81dbb917c080a95715b94a59323788122134950687007359f01a670e2910 SHA512 e63dc6a07ccb81c03ede5b0a3707c59818e1f5fa1e6a4c81195d48747093666384ad2f2a059d14afeaf2179bc126e01aecfce9d24852be4aa1c24d3fc7421e5f WHIRLPOOL 1d59a9da10590b8cd659d1df4bb81d1e926191450034f867b61e27c47f11fde4c30abfcb7632aa26c205a126b26f75420528ea13c9253f8bbcd7b039aa5c2452
 EBUILD munin-2.1.9999.ebuild 11572 SHA256 c7b0b7164268e6dced4a6c57a7725925ab639bfbf4a010bb0f345bac2533f296 SHA512 bbb13b562cc49965d6d2f821127987cbca7f92cbede7eaaf104dc69a28d211950add95d65fad67c721628578cec3e82a808aef6c6fbaf32a2a9b114551e390ca WHIRLPOOL ce77ad52beabf8189d707fd3d0d3273e5c5bac380f1095868805e01f18dcc2c40125e795cadf8c873950dc23048cae7b46f663cdb83c1228c65cfe47c25137da
-MISC ChangeLog 30915 SHA256 df9cf3c70cc84349701626788fb34eb0d297933261dbab9fe3647ab1affc2a59 SHA512 e8bcecf43cb1239839e3d121a1f20e517cc2b82a41f3b5c4b451f6abe68edca4af6f9dd9af2881a98b9ad579f0ddbcf7d64f37f27e1ed29093162ac8be06e305 WHIRLPOOL 76402a19d54b82daec534d3f9ff4eb257014b020dc86b893e09299c4930c578109246beeb8d983126984cfdb47d0ec173b3feab8430069497fbd334b03af0930
+MISC ChangeLog 31063 SHA256 75d60f1dacac959314ebdc123bd75a7da3cee811f9c4c0be5dde826005f98898 SHA512 293bf0cb0480bcafaf6a4c8a31cd92fb6a1839404cef39ba56a0f351071c4df22f6cc8fb270a18667a6cfdc9b7802f652ede088b141f79c3bb90db5d827dea96 WHIRLPOOL eb68c17f88dff89926c94235b9a5f6ecd0f3afabe1eb0fece1cf9c85f5a58e13e224a2a958a7f868243ad41c472c559dcd8307d9aea18be098394462bed4df1e
 MISC metadata.xml 3824 SHA256 5b838f6ccb778750cbcc41052480daaa9ebcbee5ee38ab66b054472b6313d177 SHA512 277f3ab9589982617b60ce8ea63802288dc4ff5368416a942f3670804a8e0a4cd481b2d0ff91302be040d2aba4f66a2e11b0c181164e6285dc33b150b263da60 WHIRLPOOL 7486ffd90f12e32a9feb557b4937397317cfd4325e5ffdf1dbaa749a90f3c47f797baea306585ac4a200e4a23901da1de10a9f0b951a15bd27f8a7c876c504a5
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRfXiYAAoJEBzRPIrUMBNCPUUH/17hKvOEhAeAx4Qi0uZFFHdL
-jD4dCIdzOcpvgOTwZJS3aj86HHei9wm4UgaushlZUU+QaqUDPreZemvwPMgT77jo
-3dk6JTTX0pG73hbX6z17m8nGtqmK2SDyDY4/KLZDGYLK5hX3uQF2Qiou6+pd45T6
-84+7Ey0AaY0zA77kkxaK7PDg9jpM72+EeW3s1x+uHWznmNZIQtYHVQ4yTeMeo26e
-QelHdpIci0qf7C1tp7W/hSh4m7QwSmE22WX1ANME0qc+7QS9zlKl0+9mB/8awY0W
-Jyx4lY8JPgEhjl7pOC2g/eEwiq11NzOgBCKwMp2OpmkR1k9LpdYBjYYiApnbz9c=
-=9LUu
+iQEcBAEBCAAGBQJRnjbJAAoJEBzRPIrUMBNCWx0H/2MPCPOyn9aDjoJXfROsPTO5
+W3MhXXZz2q0V/csy6H+E3tPqG9tA9NAalYPvaU5zD626uo8Lveq72YP+M9btgHzA
+PbuJtWzATv7TH6owdJwgHnuLZfJRbGWMkI3Y0/kAbtUvPhNPU2/frh5bxRutJPa+
+OxIrse25Mfqu83jDlt2RpPoDbzMjtD6OAKGsiKsQ1u+K/gpc7Bp38dTPGyx5/OJj
+kvULVqnoz0wW4humvHgiIeGxi4SPw+D0Y38GFe54kqQPOUghiVouYfEwz547Z5vw
+6dVukTBwQX3OoQIcv6kmYOxhpOU15GKI+PGtBJQLOrNmYbBHSFZ4oL4jw6AhHNM=
+=I7CB
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/munin/munin-2.0.13.ebuild b/net-analyzer/munin/munin-2.0.14.ebuild
similarity index 99%
rename from net-analyzer/munin/munin-2.0.13.ebuild
rename to net-analyzer/munin/munin-2.0.14.ebuild
index ea2dcfdf9d90..7000a0461bfe 100644
--- a/net-analyzer/munin/munin-2.0.13.ebuild
+++ b/net-analyzer/munin/munin-2.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.13.ebuild,v 1.1 2013/04/28 19:29:06 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/munin/munin-2.0.14.ebuild,v 1.1 2013/05/23 15:33:19 flameeyes Exp $
 
 EAPI=5
 
diff --git a/net-analyzer/wireshark/ChangeLog b/net-analyzer/wireshark/ChangeLog
index 1365c6bda0ab..cf157300a13c 100644
--- a/net-analyzer/wireshark/ChangeLog
+++ b/net-analyzer/wireshark/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/wireshark
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.492 2013/05/20 12:52:26 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/ChangeLog,v 1.493 2013/05/23 15:49:03 jer Exp $
+
+*wireshark-1.10.0_rc2 (23 May 2013)
+
+  23 May 2013; Jeroen Roovers  -wireshark-1.10.0_rc1.ebuild,
+  +wireshark-1.10.0_rc2.ebuild, -files/wireshark-1.10.0-pkg-config.patch:
+  Version bump.
 
   20 May 2013; Agostino Sarubbo  wireshark-1.6.15.ebuild,
   wireshark-1.8.7.ebuild:
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index 3e70ac681edd..18ec72cabe8e 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,36 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX wireshark-1.10.0-pkg-config.patch 314 SHA256 9b4e0baf156b2d763cc62cf0e77121de30df303b37cd64a9bdb1097295de36f9 SHA512 32ea3b5bb78d55022ff164f7112865721d0da951e4ab5b727e41e663f217b013da69003e11c6906bf0b375ec60795f4913e3800d8913e775f302c9344f9355ec WHIRLPOOL 1ee6ba771983dfc38e878a14d498058e3a804d37d03c8ee5b79111f02c480983e55cbe7de2de7b28bac3b0f6209ff1ef3be7dbddc5a3b2ec3c4d342a9f20b98d
 AUX wireshark-1.6.13-ldflags.patch 230 SHA256 bb56440fb9de9ed480b992d202feac93a53003e9fa47869f54c6f2f30d315720 SHA512 c4a2c66e6ea9b523ca9f5a3e37411221f5aa630de07d7bf84633855ac44da60b3b493671e578dbfd67de94e87ab1c79203f9b80b57f9460f2a81ee39f58171b3 WHIRLPOOL ca20e190c7a8d7ca69c6d90cfb28f8f1c8896b6793b9a026567ec4df4f7080ca6424ab249d01754db1059891d32362444178272489b4425e895f3031a0e1e0f7
 AUX wireshark-1.6.6-gtk-pcap.patch 841 SHA256 862c301f450fcb775e3bd907e5a6ca667b5a11b819768b66a7c848c2c3c90d8a SHA512 0ed1bce8b57942de72ee0a8d78ef7cc345ffea512248fa65acd4e8386a5aa61dde14663090578c78f3eee88c7966e8d40aa6d3dce13146c2adf5ed8ded019253 WHIRLPOOL a45a3d04c9823eb149174fbbaaeb5437e525d77da962aa627509941da3119e87d4eef26cb06b1d3534356c4fd1d4bf31bc102dbf8b3f69994a19dba8d730d05f
 AUX wireshark-1.8.3-gnutls3.patch 460 SHA256 75db77b9dd286272583c6def9ce9ebe2feea59c8c709eb7065e0c4d9bf741967 SHA512 8c37c020e1addcff70f631b710a15de040eb7af5fa43c0faad6729a090be180fb9d52ebd10a3aac6ad6e49344f795d27e093b9e7e3f591c835a0883ad9066ee6 WHIRLPOOL 59646ef16e7042cbcfa827525cae0f0de7e8cd7f9ccc01324e73b91c1dfd454ca7f7156bc477bdd601bd908969d217c251a33d91d9f6b334b0737035b5d55b66
-DIST wireshark-1.10.0rc1.tar.bz2 27061529 SHA256 1fa881a4f556edbf251d029874a8a151c60f812bc0d22f9fb05210c4d5df72c2 SHA512 b864cb94e10677710ccfa2c772faf30fa5ff20c34416308e4db0d252a3b32c86ed4d52dc3238fdede5f7d9d7543eccf0e61fb04fae6b4a31fc6f8e86b270a7da WHIRLPOOL eebc0e08cda316008a427ca747b41a3b2f2f71e1121cec9b89320e99ae4d699730c6190510430d86f540e47856c386f8ad755c4260e2910777f39954bd5b482b
+DIST wireshark-1.10.0rc2.tar.bz2 27099146 SHA256 17f9d6aac43c8de926d81e9f985918b51ce0f3042f93e2515cd3c768d705d444 SHA512 14ca92ea47e836a86c224dfe848c0bda55c31a466488fa5a4a750938e6a8f9f11bcb4f3d7e2cb584a5d6c99c68b7858dd9d5af1052accd265d6bca2a8e8c2f80 WHIRLPOOL 1b07c154de79bbcae485f8b9b5d91039de59d6420a496f0479776152db16b112754b15f6f9e55392601d0c9d9ac6640bd8de1136ead8b8b0347e52121cf93055
 DIST wireshark-1.6.14.tar.bz2 22121915 SHA256 fef159fd04cc1db9ce59209a48a84a808ad43f9d8a2767d47ab151482f75a83b SHA512 855b5ecac33d4b36102420ceffc2ec36fe10679f9233ef4c31fa6492c9b85a38557d987fc037510de6574a7911e9529b836f77b4a6cd673b60c3ff4e32cb1542 WHIRLPOOL 8f4c4a5813503db40efd88bbce931e26f1513496468a86e16438cd84b447e99f67d11591a5873fb7697500a12d9eb62df295d73396c78d25d114f3f3c33020c8
 DIST wireshark-1.6.15.tar.bz2 22153133 SHA256 d6387fae55f19d64d4134503f3fbe62f245ab2e9053dae3ebc76d0ba887b9de0 SHA512 fd12090a48326a552a7080bb34a8ff24ccdc48768b271bba32dc5ae76383df7cac46ca9316b4ffbb5a6a84d904f1259fc96ebe51b47c1bc68e9a4667784286e4 WHIRLPOOL 9f40dd0678b6de5ae414ee5976cb8a4ae852dd168f260172103491b5c9314948d18ce685f1e58f059ab8f519d4da61f251f018a78207fdfd03923c8ab5be8c1f
 DIST wireshark-1.8.6.tar.bz2 24250787 SHA256 2722ed3e926c26648faec31a81b7881d829df85762c21794b9dd9e4f227331ea SHA512 d130c615d950875c3e119edda8a5c6842fe48d57c77bf8cb8751354455fc1bac3c6c6d65b0f76be6a83e4350eed85337ffcad6d006c95fc713db9afe172e9b16 WHIRLPOOL e5de3cea6f011d3f2d27ba468035080aa2cb836a363e027064fa788e969a3b05de8f7b6095bab1a6f5169f5de2ff91620abf271a8e047b4907821bbfc4b04128
 DIST wireshark-1.8.7.tar.bz2 24273700 SHA256 5c7e429c1e410289b49d65a2e635e00c0becdcb56fe703a1d3e7b5e275fca842 SHA512 4a0606257d541c6045cdab19f2280d409e737af6ca39f7633b7df13f5d128f16bbe2c53d84f8d79feaf0cd790bc94114495b99d2bbb938e6d5ebe0d398fea66a WHIRLPOOL 54c8f30cbe8765a67a5f5e97ec69444eff00737a03c2a484a53e12118863399411448691b75d9ac8d677cd8cc012d7fed9500a3086c388e2d02de9a273e1037b
-EBUILD wireshark-1.10.0_rc1.ebuild 5900 SHA256 e294dfa25001579bf13d13947e84a0994570cfc2fe8b39c0595fec9c0c8c617f SHA512 9d064d56e89993920bffe7c1eec52035827855cdb6700b0642f45b24847546857ab190eddf48c02f4bae648a64c17b7e6373198f3cfef1ca0780799a40535842 WHIRLPOOL fa7b2e80d75302d931565ad156208caf99ab00aed728bd067d154dfe19475c22a925b37de501c10377d0e19db256559372b2f53163f3c963e74f69f5e2422ea1
+EBUILD wireshark-1.10.0_rc2.ebuild 5852 SHA256 92e8cf773a5adba2e1559d127020c0877eb5266a56ce51bd1b4d181322ca2803 SHA512 1e5d9793a763f0cbd48b46ae378b7427a33c7f9fea153b34cbf07ab23adb071f7dfb5bafc50707f015173b000e5466f7d87778a4c894d9b9dcb55a9ac68d48db WHIRLPOOL 008f3f7344c1f1f0cfaf3f3a5e6f108f54328fe8ae1ad9f6a7aef7cfcc0c1d72196e396a9bdcc14e2548f9fbc5a09ee61b9f6e2758b649b9fdbd262cdc7e91c2
 EBUILD wireshark-1.6.14.ebuild 5250 SHA256 ea8fb5356cf0d3e81bf8594de8a1a2a5a6d6eb4488d9c018b4a86008e9d7c31b SHA512 59a0c6bd9c16f8d74f3ba60b26594bcf423ddb351d2d92fe10af6250532e4f3beb1bd8e66da981e97019fef9fdff51fc6ba61ae5d20e0c711b0c3697e53dc82a WHIRLPOOL d3e3f6d39ed4c197ac4183b6d36a3a762aebc2770bd9f36d8f6e53be9172a9d6ae3581a933f3566619d85decce987d4462fd091a7717782592ffee8216d1538e
 EBUILD wireshark-1.6.15.ebuild 5380 SHA256 5387338b1d5e6092ba20bc11ec7d57e3c2a82f70cd69abe1e258912670fa7788 SHA512 70ad49ce09c1e5c543fbfd8f38c6f97c7bc03ab62e75e703f7ed9989b4b1c573f242316fc2526070dcfc32278e0cb27b8a81feafcb388f3ca61373cbafd560bc WHIRLPOOL ffc21570f3f066b45fe35c2c43d028838f4f99ff976bd76ee9cf232b49bed21a422ea6190a1ed4a0310cde8ac2cf07387b819567989dccb26b9d8893875d8834
 EBUILD wireshark-1.8.6.ebuild 5569 SHA256 3021127e77b215c9e981bf0793a92fea76e4a3b637344b8cbdbe073b0cc6c3ba SHA512 0f4d0a0d3abd7b1730825ea86e05bf333997572251505c01fe433c219982797f178731e93556cb475638e6206fdee6fcb00ade702846f0030b39faa5727bb0aa WHIRLPOOL 3c2f63aa6f2b77241d7fee7dd25c8f812369aa6605202922869c2a2261637002d4d9251dc4af2ff25ee849b66cbc4a2c3ef77de14981b0462fe448a31f53c6e3
 EBUILD wireshark-1.8.7.ebuild 5784 SHA256 3e0a014a797261e72e65c7c21415aa864ae1592774e5ea3f4f0bf8e910d34016 SHA512 d559c014a5fa2cebd73447de6e16e2e95339cf45dd388dfd5d6be07ae7cf668d501d85c12729604532bdb4479c7331ab42a3365a5fee30200412b2e71c780814 WHIRLPOOL 2ce423ecead9405becbcf42055b927a7a9c1c15fe3c24660f8ebe3b2137f99a1cb49b237e65e43f7b0773a11098d9119fb5bbdcfb17aa5f6286fbe5d486b1dd7
-MISC ChangeLog 71767 SHA256 02443bfb215e269488018210396bb0fe24b4b96e29303d8e22a17eb036380a84 SHA512 32053006cee4579cafc1089dc7b7393b3fc9fb1a5b142cdd0b956a45c3c81ca23d2d49015ef1fedf297067ed950e8d1ebdef9c4baebcea03b2506cddbc04eb6d WHIRLPOOL 9b75776f55a106b70d6fefd369f9c623ef9ec615c2234e157646424a9c26966001dc17bae90f8ec9d97562cf51e5366d5452af297eaa5705c1f391dabdfabaa3
+MISC ChangeLog 71972 SHA256 df1408a62f3b292345316c33cc3f2a29235e2cfcbc0515dfd8b33c01cf82a081 SHA512 5b8046bfec7f599e102025606250648cc3906b7fdce59484bdbf77df80be80e4417495f7b973b4a7553df0ed31a3bb155fdff25a73aabe1db7d7a94d534b1116 WHIRLPOOL 99fa14907388266aca158bc95b7aa51c41511c7db0c8374666150b249d52db458cc3a741274a2ef6dd44be9ba124163dcc943cb50a96364c772a2978f559ba66
 MISC metadata.xml 2476 SHA256 d3160185578d198161686cc780d11ac30e4293edf70171dcdcd6d765a1b21cf2 SHA512 ab8ae1a87f8cdd28965782fbea8e8b535499a7dcfce2cbb0ce9deb3d06767ebf74d2b856868223ae011da4e366cef3787872d6c81aeb43a6ea2de12ede2af56d WHIRLPOOL 8aff37fb6b84367d7597df7a3889912cdbecc7da3111759d8d3d39eb2f5cacee40b743c9bb9d84a18df2f62ad77a0fcc7f0e726705044329dbfaa2aa1719742c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJRmhvlAAoJELp701BxlEWfZcYQAJBUtuTbsCbFps7lSi6qQKDf
-K1KGhddpCUk5YbSdoRjcEoEl9iQS8feXpLT9u5TMrW3vL6XK4a6Gpm9/5JxhpFA4
-21/7FNb/eQv1vI9t8iEFT3VjixLO/Faejk2Gm3XacfRjSr+6FO5wbA4lQAua4OvI
-asVl1IyRBdF+gVzqzSEmhxTjM1A7TQQVRST4sHbr4k/L/PotcSjs0jeoId4yUO6j
-5U8WjuzuDX5k7P9TR2qCwsu6r7UKF6qESQ+PZS7ujOlbI+qT4KpDq3OM4spdG4uU
-Ce/Gddl1ODE1NC45RlqsSktcHET+RxAXIsn8j5nwCmB1Q0LkA3v3rP4FazNBkB44
-3akcN0O1pDw6mEwEI/BMJloE2+CwjOK9ToY837Ri5kb3Gs/Op/gnIODEeuRP1XQ6
-LYqENE7mJagwrQ3pzyC0OBqoyG6L/e6WJfmzgWdGtcNpdvbhXKfaxnIzE86DNltp
-LPybsXImPjAKDyT74REJdS7QfdJwVBZ1so8447Q43WMOQAzcCn+BKteHRsqEKbq4
-jY8w9K1K8kh2h6IxkV7Q8JBJfrZH39PQ0h3pfgqOINWScwJaqkMAxNoXIGUpiRPm
-TyKq9rYJzjS6GoRVcQWPQ1cgAduAAtzzX7CPCkB9G5HjueBH1591xjbr3sJu9WPS
-TJ+SNKKCfOAyRNDhWUNp
-=Zh85
+iEYEAREIAAYFAlGeOnAACgkQVWmRsqeSphMJ7gCeNWfuQU/aMTr8QeHtZOlgDx1X
+V/YAn0hi4IFtRUN6sXxetggqbJyLp9l7
+=GyCQ
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch b/net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch
deleted file mode 100644
index 2295f34c629d..000000000000
--- a/net-analyzer/wireshark/files/wireshark-1.10.0-pkg-config.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/configure.ac
-+++ b/configure.ac
-@@ -185,6 +185,9 @@
- AC_CHECK_PROG(HAVE_DOXYGEN, doxygen, "yes", "no")
- AM_CONDITIONAL(HAVE_DOXYGEN, test x$HAVE_DOXYGEN = xyes)
- 
-+# We need to call this because PKG_CHECK_MODULES is called conditionally
-+PKG_PROG_PKG_CONFIG
-+
- #
- # Try to arrange for large file support.
- #
diff --git a/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild b/net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild
similarity index 97%
rename from net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild
rename to net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild
index dedcc28581a3..f304d44eaecb 100644
--- a/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild
+++ b/net-analyzer/wireshark/wireshark-1.10.0_rc2.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/net-analyzer/wireshark/wireshark-1.10.0_rc1.ebuild,v 1.8 2013/05/08 13:30:13 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/wireshark/wireshark-1.10.0_rc2.ebuild,v 1.1 2013/05/23 15:49:03 jer Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
@@ -81,8 +81,7 @@ pkg_setup() {
 
 src_prepare() {
 	epatch \
-		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch \
-		"${FILESDIR}"/${PN}-1.10.0-pkg-config.patch
+		"${FILESDIR}"/${PN}-1.6.13-ldflags.patch
 
 	sed -i \
 		-e '/^Icon/s|.png||g' \
diff --git a/net-dns/pdns/ChangeLog b/net-dns/pdns/ChangeLog
index 481935f3509d..6c503ce184d8 100644
--- a/net-dns/pdns/ChangeLog
+++ b/net-dns/pdns/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-dns/pdns
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.87 2013/05/20 19:05:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/ChangeLog,v 1.88 2013/05/23 12:14:11 dev-zero Exp $
+
+  23 May 2013; Tiziano Müller  pdns-3.2.ebuild:
+  Fix dependencies for USE=static and add pkg_postinst functionality to fix
+  permissions on /etc/pdns (bug #458018), as discussed with swegener.
 
 *pdns-3.2 (20 May 2013)
 
diff --git a/net-dns/pdns/Manifest b/net-dns/pdns/Manifest
index 80942918e38a..d74aeef70e3a 100644
--- a/net-dns/pdns/Manifest
+++ b/net-dns/pdns/Manifest
@@ -14,19 +14,19 @@ DIST pdns-3.1.tar.gz 1268532 SHA256 1400f7bd659207c0b1f4b8296092e559a7b7bf6a2434
 DIST pdns-3.2.tar.gz 1293593 SHA256 d1895aba065446dc68e5d7cc792d5303626c71759f61a455531ed65d59c06572 SHA512 ba129fda742f06983b429b245a86288cc5738beea7e8776f3d7980e6cda8e9a1efab90fcef84093f2e4857fb83d3b1c0a258d1d875ebf0bb7724226877898335 WHIRLPOOL ac105586c5860615ffa18923163c822b37cbd6ad902bf9aa60d952a82a1f7102da127eac330577d63e841195599ac5b67177b228c5120249f226c480cfa387f0
 EBUILD pdns-3.0.1.ebuild 3064 SHA256 1b67ba8ab60cc5be702d0c3552d6efac8235d8914ae5383c47d33f172df185ea SHA512 b40abb170207838c7b49d3814eda7767eee6cdf25508d5097f471f14612f2de56d4133ab12ea1481fb8130cf3d96b1650550af84461b3c549bdd7494501fefa3 WHIRLPOOL 60d93ce9ddec34b5c51c35fd14842e6ead3ec752afd9aec3c29a453c841219eb05bd384eb3b6969b208fb9d2166e5c292e86cd90fcf876905b5031b3efc5afeb
 EBUILD pdns-3.1.ebuild 2928 SHA256 5790060a9ee78d32f1e57959223d8e487399eb3ae6ed28a13c426eb513a9ade7 SHA512 e8249d9584f6e10429e60009b06176324c8141717ac590a7c464338b8ed80d823f5b43a01c25de0e30e968a88e72d53dd5a6e5c5b7d84888bf9fbf97f0721498 WHIRLPOOL d18869852f88a5f8582cc328d6f89b71c073bcce1bc5b30f05d8da77eec5f043cef8aca4d6098bb26378ffb7dffa0cc331920354e16546aadcb701e9d70935b4
-EBUILD pdns-3.2.ebuild 4075 SHA256 cc0aa013ae01738cd8f19846e7883370c19111d9d8c0640523fd7fe3df15d816 SHA512 6bb97efe92c4907b4502e9542b8bc05c48b86053aaaa773bfa404a8e1788a7d5de4ae683efa36e0a68887137ad8726b8e18f7c6271c2f561f08615298f7d172b WHIRLPOOL 71df3d6d66d50b7a5117eceb4cdc2b5b62e350581a71e1c41316e267c358101ae33d3b5282d7e86054366706cbcd546ceb5be315fcb736eb85b9db7b5577a90a
-MISC ChangeLog 13517 SHA256 8cc0bca6cdc0aa32259702ffe9f9723b05798f6610d8eca222e5745604885dc5 SHA512 edb45be76ec29d1d82be3b124a45f8ce23464eb556ff510366a61fc0d4d8fcbc8f9af02005813562900185b86ed514cc15c451db108f9b8f30297f3466293fcf WHIRLPOOL 631b08612ee9ff668b0310cb01ca26b7062b4f2ef85408933b8966d436b0b8c40df7f8a5973bc1ac91317990a2034be871ee05aa413ffb5b6d84bd7552ff0f83
+EBUILD pdns-3.2.ebuild 5157 SHA256 6fe3505ab232ca8ada8c8249a7e7b1b85cfa6a2d1c82a87d0ce541c565efe56b SHA512 2077dbe71978203318cd524de896d1658fc2247450ded287c139608a49638aa0cc8b177b3d2b949f2123284303bc6e21c5595675f8732b047e4cb6622082f454 WHIRLPOOL cd5fced49a6187454ceea19613f9c447e55418f092b0d35a42103f9bd49b6ed25de652563eb3c28fcbf5535a2166a726fd0a0b526dfca7e7a0c15cac08c7ff8b
+MISC ChangeLog 13734 SHA256 3f0ba31d6655b071f29ea60496c9c072b69addb29d96cb8d71b483b10bbc829f SHA512 5c6acfb6741145a08fe98c06e42e6bd6256756a1274eb7ba39178fb77621e9fcea657f1053d30666cd654b47e02cedf9e02979a88fd5355070a66b86d7cdfd9d WHIRLPOOL 97e89a9ebd1d55d1340828554f950fd5c0229d83c5e70f033cc5f070667a8d1b9f1b8b6b00e7317f780bb7905e9e80b5fd8a77a434598a4c6786bdcb0904fdbd
 MISC metadata.xml 1420 SHA256 71d1877c78a2ec451298ee16f2d482c37d93bd16687ed1ff5aeeb049d72772c4 SHA512 87faa2dda26ee19baa11380759e1680de0f4b5924306d0417ba126dd44defed5095fb03adb60dceb27e2151e359d0111b05103a590ef2991c69f31ba8012e128 WHIRLPOOL 9dd8c9b188802b6e0c6c77faa957b62794932ffed131cfc4b80d5ea84b2b6f5057ef3e663460e4c9baeff76c384e981c131227a92e80a4becdbf9de6e64c9e4a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQF8BAEBCABmBQJRmnQNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQF7BAEBCABmBQJRnggUXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ1RjI0QTQ0MjI1OURBNzI4MEIyREExRkQx
-RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfwdsH/1pYmkvluELwZpjU0yKGIFMW
-YwV8XtLRJBJ4gnPbLaG9wq/UDAKwghNCKjU5Vs1O/MIODw8MzLE6ktZjcMtT/DUX
-7xzBIf/4isM4iaP/RxgPlizcnhqZVSwTlYBe8ogh5+gZHWnvgh2/ofTB6gzqHERe
-RRpxY4j+sY2zsjG0a+DU+7zUV1FikQY5GtWqsIrSdN/4MXh+74ZPxo9sk0how3GY
-8e9Sig2mtOVoqKBFXpT+UhxTn+Ua4T/Faa7k2M3Dbd6wpF1DgtW4cZW3GMRPZs/6
-Vrx0bwSl+J3z5cmv/0YSfLD6+Eqk3fAu6rsMGBMuFTrKaZnfO+SAemsK0cWtbxM=
-=6t6s
+RTdDRkM3NzFFMENBODVGAAoJEB58/HceDKhfPvkH9RFojvuni36Ibv9QheIo/hPI
+OtYy6QGCjaeNAThRycdZrRDBFSm1l2UxVg5ThA4skZLSgWxXoy3xoNnjTZi3EYlH
+oOePP0rwmMgVMFE+7Jak5nhRBxrFI+ow3vAZgesSFkY1CsFNkqcObwyckYwkR3JV
+qdlBPE5VLf8L0e3+pqgYVeCPUepug5L5bAKMtulfSFKBscHIbQs7J9rG0RLCmhXI
+IAXJPFhYwAcbXwpmVoRJkcriM8bxZgP6cVwUahaAjStMQMIM8QoHIYreYW/uIm2b
+LNEZsCoBqqn3s4PSwnM7S1fw7M+y03LrwxGU2ll/f+gFEdvYm8Mdi2o6gXsJOQ==
+=esjZ
 -----END PGP SIGNATURE-----
diff --git a/net-dns/pdns/pdns-3.2.ebuild b/net-dns/pdns/pdns-3.2.ebuild
index 4a6afb9afb2c..4e4c295c852f 100644
--- a/net-dns/pdns/pdns-3.2.ebuild
+++ b/net-dns/pdns/pdns-3.2.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/net-dns/pdns/pdns-3.2.ebuild,v 1.1 2013/05/20 19:05:48 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-dns/pdns/pdns-3.2.ebuild,v 1.2 2013/05/23 12:14:11 dev-zero Exp $
 
 EAPI=5
 
@@ -19,29 +19,41 @@ KEYWORDS=""
 # oracle: dito (need Oracle Client Libraries)
 # xdb: (almost) dead, surely not supported
 
-# TODO: sort out static deps
-
 IUSE="botan cryptopp debug doc ldap lua mydns mysql odbc opendbx postgres remote
 remote-http sqlite static tinydns"
 
 REQUIRED_USE="mydns? ( mysql )"
 
-RDEPEND="net-libs/polarssl
-	botan? ( =dev-libs/botan-1.10* )
-	cryptopp? ( dev-libs/crypto++ )
-	lua? ( dev-lang/lua )
-	mysql? ( virtual/mysql )
-	postgres? ( dev-db/postgresql-base:= )
-	ldap? ( >=net-nds/openldap-2.0.27-r4 )
-	sqlite? ( dev-db/sqlite:3 )
-	odbc? ( dev-db/unixODBC )
-	opendbx? ( dev-db/opendbx )
-	remote-http? ( net-misc/curl )
-	tinydns? ( dev-db/cdb )
-	!static? ( >=dev-libs/boost-1.34:= )"
+RDEPEND="!static? (
+		net-libs/polarssl
+		>=dev-libs/boost-1.34:=
+		botan? ( =dev-libs/botan-1.10* )
+		cryptopp? ( dev-libs/crypto++ )
+		lua? ( dev-lang/lua )
+		mysql? ( virtual/mysql )
+		postgres? ( dev-db/postgresql-base:= )
+		ldap? ( >=net-nds/openldap-2.0.27-r4 )
+		sqlite? ( dev-db/sqlite:3 )
+		odbc? ( dev-db/unixODBC )
+		opendbx? ( dev-db/opendbx )
+		remote-http? ( net-misc/curl )
+		tinydns? ( dev-db/cdb ) )"
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
-	static? ( >=dev-libs/boost-1.34[static-libs] )
+	static? (
+		net-libs/polarssl[static-libs(+)]
+		>=dev-libs/boost-1.34[static-libs(+)]
+		botan? ( =dev-libs/botan-1.10*[static-libs(+)] )
+		cryptopp? ( dev-libs/crypto++[static-libs(+)] )
+		lua? ( dev-lang/lua[static-libs(+)] )
+		mysql? ( virtual/mysql[static-libs(+)] )
+		postgres? ( dev-db/postgresql-base[static-libs(+)] )
+		ldap? ( >=net-nds/openldap-2.0.27-r4[static-libs(+)] )
+		sqlite? ( dev-db/sqlite:3[static-libs(+)] )
+		odbc? ( dev-db/unixODBC[static-libs(+)] )
+		opendbx? ( dev-db/opendbx[static-libs(+)] )
+		remote-http? ( net-misc/curl[static-libs(+)] )
+		tinydns? ( dev-db/cdb ) )
 	doc? ( app-doc/doxygen )"
 
 src_prepare() {
@@ -151,4 +163,22 @@ pkg_postinst() {
 		ewarn "The official LDAP backend module is only compile-tested by upstream."
 		ewarn "Try net-dns/pdns-ldap-backend if you have problems with it."
 	fi
+
+	local fix_perms=0
+
+	for rv in ${REPLACING_VERSIONS} ; do
+		version_compare ${rv} 3.2
+		[[ $? -eq 1 ]] && fix_perms=1
+	done
+
+	if [[ $fix_perms -eq 1 ]] ; then
+		ewarn "To fix a security bug (bug #458018) had the following"
+		ewarn "files/directories the world-readable bit removed (if set):"
+		ewarn "  ${EPREFIX}/etc/pdns"
+		ewarn "  ${EPREFIX}/etc/pdns/pdns.conf"
+		ewarn "Check if this is correct for your setup"
+		ewarn "This is a one-time change and will not happen on subsequent updates."
+		chmod o-rwx "${EPREFIX}"/etc/pdns/{,pdns.conf}
+	fi
+
 }
diff --git a/net-ftp/lftp/ChangeLog b/net-ftp/lftp/ChangeLog
index 16c8abcd1679..7e541a938215 100644
--- a/net-ftp/lftp/ChangeLog
+++ b/net-ftp/lftp/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-ftp/lftp
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.408 2013/05/17 13:41:03 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-ftp/lftp/ChangeLog,v 1.409 2013/05/23 15:11:15 jer Exp $
+
+*lftp-4.4.7 (23 May 2013)
+
+  23 May 2013; Jeroen Roovers  +lftp-4.4.7.ebuild:
+  Version bump.
 
 *lftp-4.4.6 (17 May 2013)
 
diff --git a/net-ftp/lftp/Manifest b/net-ftp/lftp/Manifest
index 972a90476898..b673bcbff045 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -6,14 +6,16 @@ AUX lftp-4.3.5-autopoint.patch 330 SHA256 5aa4d9b739ffcc9a500988a7c80ca6a192d4ef
 AUX lftp-4.3.8-gets.patch 430 SHA256 20f3f931132aae70c6dc8b03368419951bb4ec9f0d4cfcaf5966db3c6689da35 SHA512 24e61ec6784fdf95b5df75ed29680465e9fac87f9b79eaf4a9156a32c66afd4db5b905c7e29789a8a0e0d7c6b4c782b1f749e52d4c9547c96c1b79834c2a750a WHIRLPOOL 399f1a0714ada86a47a567d49a1d093b4900847fb38994e9adbc95c82d879e061d057945d66a0f26a6015c3737f586e6b83da8d1d5b30f7f103fc4d2e2ee523e
 DIST lftp-4.4.5.tar.xz 1429592 SHA256 b8dfd5faf64c18df9a9233d208eb61595a5b2ef29dbf3d186f3759259aee76dc SHA512 02873fb0c5b899d04b9db3a7183d7d03259a363cd4782b1ce56313240c1960819aad528031202f07d54bf7bb146f7a34bd9c5fa4870cf8df970933019298f7ce WHIRLPOOL 4d1c3227811f38e8d13b6db6967304b19d6d4adb39ff07650495ec531aeb8da4cc326422b101699706b0c1f505ff70886dc3b8723e0f2d91f23a5cfd3be7ee89
 DIST lftp-4.4.6.tar.xz 1429480 SHA256 cb8c591d08ac6626a865548adb9e6263ef8af0699d93da7633ee295d762f8d50 SHA512 aaf7ea03fab63fd748d91c55f50f6ee439bcf34366a0c03e3836338b970d1a0b9e4d6f66a757bcebf43e034c26ff0d7fc04df7b1c0a38fdf63f8b55e641f5ddc WHIRLPOOL 7090d024c458fb114cb7a7cf2eeaa3cba24bbeaa4910934e59e0ed8350bcea3ce91c2a10189f816e821dcd19d7a373e0c0ae576c32f15b7c85984c38dfa59391
+DIST lftp-4.4.7.tar.xz 1433524 SHA256 4d26d7e503fe1bebe151274badcffeec3a787b1654ee3de855a32c1834f7a941 SHA512 4d574fcda6b9dd5ae0f0a14d2804704c07b4a7e00cb4372cd362e7cb89ad4d9a35aa12301408e9aa8179400c5d8a1c4630f2824c3080366abc9b31aa89140817 WHIRLPOOL 6d48b627f70946535d87cee780e833602a55f7e595f01ac2589465776996c8433494e38bc9235845e5828886b8dbf81ceb94994cea402223739b00b8c9e91852
 EBUILD lftp-4.4.5.ebuild 2084 SHA256 ffabeefbdc97bc2703f46de165820f13f4b4e29709e5415c917e68840f41c168 SHA512 1ec69d973ede7dfb71c18f3446a4455e214e4ed174865f8a737eedc3269441d51c750e49a9ce7763fafce77ce41568127e2999f1b7681b29745d392fc65bc3b7 WHIRLPOOL 93ba4217f32e39cb13b039f3d1f7c14dea07f1e0babb20bc6ba8d3326922199f71febb88cfb7ad6b27685cf7886732e1709aedc9c839ec92ea59a86a21caeaff
 EBUILD lftp-4.4.6.ebuild 1883 SHA256 e49d9751eb3b12b1f334ae27f314593d6224dc3bb96788ba01730d7800a12f4c SHA512 55388156ffd01c1e14e69eb4a04e1cc9aeae0b6fb11de22546787f3006e96926b974938f1a6661762324978ef506b8cf04f7bd62edbda2ec9118c099504979fa WHIRLPOOL e492ef6e36204fbd446024cd40e993ff6c45638a134286df172d7eff267fe2c934ca068c18bc7c10c31f09e8026ab4f6e2b4d711d0e45c018b79d44ca26492f0
-MISC ChangeLog 51757 SHA256 7b6fc0369d56dd367d1c23a74ef17aa0405edc58e263681d9f068c8166888043 SHA512 c7054465eb15f0f6ad7b4139747e7188fc24ea3eb0f148103a10bbabfb5951b33bfde61043670a46333389d32331f60784684f1298d55f670b91060e94c804ec WHIRLPOOL d6d2f5879cf8bb21573acfe4fa06a2617792354d0ad8a0fc3e7e1a8adaf83f4234efaa163c1faadac65f90e2b4b1a2cf5320690924f0a1e97debae380b692850
+EBUILD lftp-4.4.7.ebuild 1883 SHA256 45fa069d6c75a25236551d522b624fd69c6737eb67cbf99badafc0b985facc8a SHA512 3eca660bda010366d611cad4f2398dbb6f2a92b006cb199951a8f0af58459e0710bfe25d50932f44621b7cd704f85ead215103fc7de853bc8c85fa18bb7c7920 WHIRLPOOL 559e6ea33720de23f4f5ca77b9d6b9adbd821275aef80eda626c90474fa5d463eb83d43659e6850b93c8959dcb2c3431a2a84bc6789b50d191ec7626c546199a
+MISC ChangeLog 51868 SHA256 4b5298bba2f1dd7db7a8b70cf2587da6a2603e49ae626218d7db41586b55ee60 SHA512 4bae1aafa5fe9f5d752e24349a4d08fbca0440292e86fb749fd5098e60b6eb1dd515372eb2e609f09825a2dfbf7096f614ffba57ff9c703cc5257e5d5c4782ba WHIRLPOOL 4ab9967b76b70534dc3b2d7d06a101d0131ce4b3746362ad15245bbecd950a8bcab26537c7861372c6660fa51b8f3a50672f1611cf871fa9c9c22dc86cbaa6da
 MISC metadata.xml 321 SHA256 eebeac2cfe38ac0775c5e6ff273df9b063a719663223d8cd7f3560f07c963e40 SHA512 8b01c6fd719ad981ab3f931770672fe4bfac8b5e414b8fc5d57462627d1f282f2b65a7e6f6e438eae4e8511daf3a68f5d61f1cb6d435b90c00b042d935af314f WHIRLPOOL b4c784b93f9323228a7e84fdbc2233c02f8622de41955e057b95960402df35d30af25f8ddb2ed6faae1b0387a8039e6c36e073fd4978c7079874730020f23e6f
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGWM3AACgkQVWmRsqeSphNpbgCfZ5n5HtQuycjQmQ7a2KKkQId+
-dmsAnRKDK0Aw6g/JKJimyaYHGP7FFicv
-=h3+k
+iEYEAREIAAYFAlGeMZQACgkQVWmRsqeSphOWlgCeOsWD8dIhVtL4MyIGfREjsIuG
+ukIAnim6bFJrV6pbDgTdo3Ubf7FhX9sq
+=IyaF
 -----END PGP SIGNATURE-----
diff --git a/net-ftp/lftp/lftp-4.4.7.ebuild b/net-ftp/lftp/lftp-4.4.7.ebuild
new file mode 100644
index 000000000000..60f8a57ff61b
--- /dev/null
+++ b/net-ftp/lftp/lftp-4.4.7.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/net-ftp/lftp/lftp-4.4.7.ebuild,v 1.1 2013/05/23 15:11:15 jer Exp $
+
+EAPI=5
+inherit autotools eutils libtool
+
+DESCRIPTION="A sophisticated ftp/sftp/http/https/torrent client and file transfer program"
+HOMEPAGE="http://lftp.yar.ru/"
+SRC_URI="ftp://ftp.yars.free.net/pub/source/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+
+IUSE="+gnutls nls openssl socks5 +ssl"
+LFTP_LINGUAS=( cs de es fr it ja ko pl pt_BR ru zh_CN zh_HK zh_TW )
+IUSE+=" ${LFTP_LINGUAS[@]/#/linguas_}"
+
+REQUIRED_USE="
+	ssl? ( ^^ ( openssl gnutls ) )
+"
+
+RDEPEND="
+	dev-libs/expat
+	>=sys-libs/ncurses-5.1
+	socks5? (
+		>=net-proxy/dante-1.1.12
+		virtual/pam
+	)
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-1.2.3 )
+		openssl? ( >=dev-libs/openssl-0.9.6 )
+	)
+	>=sys-libs/readline-5.1
+"
+
+DEPEND="
+	${RDEPEND}
+	=sys-devel/libtool-2*
+	app-arch/xz-utils
+	dev-lang/perl
+	nls? ( sys-devel/gettext )
+	virtual/pkgconfig
+"
+
+DOCS=(
+	BUGS ChangeLog FAQ FEATURES MIRRORS NEWS README README.debug-levels
+	README.dnssec README.modules THANKS TODO
+)
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}/${PN}-4.0.2.91-lafile.patch" \
+		"${FILESDIR}/${PN}-4.3.5-autopoint.patch" \
+		"${FILESDIR}/${PN}-4.3.8-gets.patch"
+	sed -i configure.ac -e 's|^AM_CONFIG_HEADER|AC_CONFIG_HEADERS|g' || die
+	eautoreconf
+	elibtoolize # for Darwin bundles
+}
+
+src_configure() {
+	econf \
+		$(use_enable nls) \
+		$(use_with gnutls) \
+		$(use_with openssl openssl "${EPREFIX}"/usr) \
+		$(use_with socks5 socksdante "${EPREFIX}"/usr) \
+		--enable-packager-mode \
+		--sysconfdir="${EPREFIX}"/etc/${PN} \
+		--with-modules \
+		--without-included-regex
+}
diff --git a/net-im/skype/ChangeLog b/net-im/skype/ChangeLog
index 70fbf90aeaf6..c4dceb2ad18d 100644
--- a/net-im/skype/ChangeLog
+++ b/net-im/skype/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/skype
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.146 2013/04/21 20:41:03 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/ChangeLog,v 1.147 2013/05/23 08:36:12 patrick Exp $
+
+*skype-4.2.0.11 (23 May 2013)
+
+  23 May 2013; Patrick Lauer  +skype-4.2.0.11.ebuild:
+  Bump for #470868
 
   21 Apr 2013; Michał Górny  skype-2.2.0.35-r99.ebuild,
   skype-4.0.0.8-r1.ebuild, skype-4.1.0.20.ebuild:
diff --git a/net-im/skype/Manifest b/net-im/skype/Manifest
index 9858e5d82c53..b6cc49f7176d 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,32 +1,12 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST skype-2.2.0.35.tar.bz2 23079739 SHA256 b56b7170e218da1e2d52d63f8519d365c54296d294a32ab605788910d950eb94 SHA512 d4496ec15d93e22ca6fac884c097aa26f4533f1cda36e23518da4f98e17736684532c33689bb58ffcddb1d537cd2ae0de8f336db2588d034f451d46a59c0720b WHIRLPOOL 9d3b3e2cc5cd973c280a50883f19839cfd2df5166ef0f82cbf043a822e9fb94e2d8350daa85cb941faec5df4982c73d4bc9a81282f2623986c39b34545de9af6
 DIST skype-4.0.0.8.tar.bz2 28719848 SHA256 f7044abb001dff02f3cf7753fab86df1a593792ec466a5328c0534595726023f SHA512 f29c5be1fd5d787583181afb2baa7bf09b9fef6aa9812bad5a76ecaeffc55789d3b18f838680051e4cfa1a10a92988166848b8074cc0e3dbb6a7870258967c08 WHIRLPOOL 36428288a655fec4145cfbec455ae530b8996fb678e6ea7379c51bf39dee7d949d7db8528e43dcbb6976f27e885f90aa1c4b0233f79161a988aa6e70b84e9048
 DIST skype-4.1.0.20.tar.bz2 30500691 SHA256 c31e47cd5dcb14eead897f36bab80ee8d49c0e6dbf469c93bf745d5addec0ce2 SHA512 81cc8426d609735b6b86307300089365f43b5b492f6f99e7794b83a2b028f1e4031c0f045ec7a6e5ea4c34d618a6e1af56b21227f4b4049fb3e3430444228818 WHIRLPOOL 894fa9c8b97b02e88c23aa7a63edf49d3059e22c273220cd8cfc26cbe5e28e14a786b311b664208de1144153a7037f122d41830aeb1300a9646869a17387b406
+DIST skype-4.2.0.11.tar.bz2 16109666 SHA256 87d30ab2ca219c1661c6497900da8fec5a30d8383f32240dc5a48f0aca35064e SHA512 b815c1537ae198372d13fdfac40c2a0e595c1edfc8e16a7e1b1fc1313d5deb5bd52c32e3a5c3d6cdf9006817e46c09cc52fbbfcaab25b36dcd9e29cef6f7ac8c WHIRLPOOL 98541dc67fc14385bacaa47b603593c01f489ab09023b79511950effc9597f5aa12e4e1ee1bdddd3f85103a59541cf41f2174ca0c3b83efca7e2031ef64aef69
 DIST skype_static-2.2.0.99.tar.bz2 34592774 SHA256 a9fa7744cb86060397597013a0ec44d21f72d30e42c5a6a28cd3ec33c0b5d955 SHA512 f67cfd98d6285d2c8a4506a68e7d3c3d7aff53695cbfde2dc7ed0b5bfdef59f2c41994b5cfe263c97d477df89ab6c57dc272418d6d2d89e5f0c4a553991914a0 WHIRLPOOL 01ff0d672a9ef9286e8a1974f07029519980942580135a293c1c3c8949b75711a480a733c37703ff755af753d9da2423bc7d235c35815ba3e0c33463312616e8
 DIST skype_static-4.0.0.8.tar.bz2 40843888 SHA256 434cfaf1de87d53b8e6b78a3deb85f2eebf75195a0f8c25f453cd618d8d1efce SHA512 9d63422b58d041ea854c7b768ce8b2f9cd3f5fda3f3113df4d71b97116e8480b2f4ee682f60d8e054b321f00ce90e45229170ca1c23a6a476a58d198ca7279cf WHIRLPOOL 062247935d2641f36d5b34530c666d1c3d262495e9d1de5d544ebdf562453bdcffb40e4e15c4bb2ec9216c84221682147c18fba3a66c8837f98f7bf028e79235
 EBUILD skype-2.2.0.35-r99.ebuild 3436 SHA256 fe826cb93a0cdee308a0d80f19c0cdbbc2e8b65ea65b2e0f3a4d9ee814f6d863 SHA512 6c6f331bbf302cfd4cabfd18cff4924fd8f797fd844a716631101c27ae35e4f416834f78889daf03c98580c0758832e744974be0c7930bb29424f01b69090156 WHIRLPOOL f03aa2a7df98a1ab9908f45beccbaa5743654bc92a32910e1a8b6b23304227fc09c0ec97fbd418edf3d3528433b9dce6302e58a34de21d804b6aaf9bc7e25f82
 EBUILD skype-4.0.0.8-r1.ebuild 3410 SHA256 9199fa7eb46fe389745a5418f57e58de0bd26ec61b11e2437b78ccbae197a7f3 SHA512 081fe6ce2105ee592a4050d4cfc86e2f43b6e3f56faab44666e58bb772092cf7a32461b4fe51942677d2a4c4a4f322bb63c9a69f4650f28b1bd8527baa878b8c WHIRLPOOL 7bd8c580664dcc5e6d16bb8cf2560cd27e4592cbc0b768e1152c58d0bd3ec8831a1fddb2a91ad68380c0768dd64b58e2c141b0bd7e196ee84a9e82516745a10d
 EBUILD skype-4.1.0.20.ebuild 2798 SHA256 ce149272c3e5046d8a8da20d289b015250a7edc69174871fd36cbaaba7a044b8 SHA512 27a13c1bfcb84a7841e0de4522b6c589d3f59bb0b13622eb7b815656de78d1dccce07c07192ee27469d90b390e7103dbc755b6a3fd811e38de58d0615e50b0bb WHIRLPOOL d19d08f23f37ee38cbe77d5da744651e7d14fdf13907e6ee0696f0d72355412716678176531e8f6296d5408cfdc178734424361ec2c0673731729de3344fd9dc
-MISC ChangeLog 25663 SHA256 922d95cf2791a9890f4dbbb68ff8430cf65e6f94c4e03c966d8313b96dd95505 SHA512 e42764ba7a0fa564870db43a42fa05159386ae9e986991b0687f6d8dc1aa64f9206e2c751c785a6f0ae56d84e3f06386edccf179a42d74fdec0ccdf1d2e5af30 WHIRLPOOL d56498bc1414cc5a146970c12a26e61f96a2871d14f2113b6808af1204692c957d9a7cab43b6b577ad3e07b7fa15ed6414a0ca7ee54eee892baa3c736f65b40d
+EBUILD skype-4.2.0.11.ebuild 2799 SHA256 4632ab3ccd93f84bdae543a5b25f1da21bc607ef33abd85a211eeba73166654e SHA512 bb12e79644b8cfe60e646d96525e2eb10d45c23f68faca007081d5de8ebe8e8a32582c519a66c3fb3b31722e4ef458eb284b1173d6cb8843e8295b0d4cb6f4f2 WHIRLPOOL 8e541beb23d71a1089559a276965b296e4d699e4c034868c9980220fce423b773c153ff6f47cddcfc82c113dd0a48f28c802a9f8feb698b36fa7436382bb6c14
+MISC ChangeLog 25789 SHA256 8c2a77374e1cb198b77265a64d2a795f491017cd7a2796c153734a04b58ee2f8 SHA512 9aa2f88baa925b9b2b4a20c63f7921acf5ef75e7ecf5d4827cf23f9ade02032ad75a387b3a611161840ab23a88cac2ea2db55df844e7551a7f9722ff58cdef9b WHIRLPOOL ce66c147decb8104c7cb15d277ef1fcf57c72d82ac92c7597d114e00d42f5e58bea55682ca9bc1b8bda58042a44a31acce105b43e4a4aa3ec5ee9b6e040c32cd
 MISC metadata.xml 667 SHA256 731cac629cdcd3afb24c75f3b49485799f16fb43735a85d01ad1e26db429fdc5 SHA512 f91159b880661dc498767b75a99d6f0c0b5853601fab291d25ab320fb5b188b65675e6d41ee51d700f281b9ad5b2bb2afb18b712d591a7d1673fdd10baf7cb11 WHIRLPOOL 83358915b9c23776516d690922953690e3acb7559b6b492ddf2038449b866007a5ff26c8b747c2577218eb68c70825bdaff26ef39d125fbf3a4fd74bab69efa8
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQJ8BAEBCABmBQJRdE80XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRGRDhEM0MyMERDMzNBMkYzQzJFRTI3QjE5
-NjI3RjQ1NkY5REE3NjQzAAoJEJYn9Fb52nZDBpoP/3FZWfsmo3bwnGnIYWgc1/sc
-p0YrlQaKvmDQJmFk/NNjjV4DPlow0puXhLDCy9VJ7wW4YZFey/nWso2KGML9BgoI
-WzCA0+KGIhV0iqv5jqGS+ymX2X0QrZqUR/z2qgT28FTrSptB666l4DrMilNJb7yd
-N3vKUFRDrtC3dMTlVFmbgHmH8ZnTFRy/oB56t9aSse4YxsGDhniKGMCZXqv6gNom
-fb+ueaxpiZmypPxxoIwPAIg/LoSP4P0IUDQ6Nx67EbLCKdoadshkYhC8fheasHkR
-0HaUf8ftDs6QXMQRAiftynRNEh2onCl12z5b0aOWGRO8ZnVFb+0nCzwwjbLv/1vO
-ji5HUoddbhQqaeoQFdvII2mH2KL9MpEka0yGMg9Kr3QCkcMSxjLzNxYS5FjZbMVG
-I/6Rq/gHai3GpeQHBWCbgoUZ9U2JU2cDiH1zFTX00K7kO3kmSh8XExysyJgxXMmP
-6EHCOT71Z3QsTrBM5zC+dUHoxVj41Bk9Z/bZroTEcK4o62xhzRahoJrUwff6TIuY
-qTjoe7el4W+BLStE0zCUMNCwx08hTt0fnnr2Zc9SM0R4801yCJDztshktQG1x0TI
-cSQ1vPNiRMmbK5UP04QXYkQp7gO995RPXdFYteNjOaNFKBVdJa03ADydQGUIpAyR
-kQtxI4nEcTPIxYxar8SH
-=KiFV
------END PGP SIGNATURE-----
diff --git a/net-im/skype/skype-4.2.0.11.ebuild b/net-im/skype/skype-4.2.0.11.ebuild
new file mode 100644
index 000000000000..bd9ccb1fc5f9
--- /dev/null
+++ b/net-im/skype/skype-4.2.0.11.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-im/skype/skype-4.2.0.11.ebuild,v 1.1 2013/05/23 08:36:12 patrick Exp $
+
+EAPI=5
+inherit eutils gnome2-utils pax-utils
+
+DESCRIPTION="An P2P Internet Telephony (VoiceIP) client"
+HOMEPAGE="http://www.skype.com/"
+SRC_URI="http://download.${PN}.com/linux/${P}.tar.bz2"
+
+LICENSE="${PN}-4.0.0.7-copyright ${PN}-4.0.0.7-third-party_attributions.txt"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="pax_kernel selinux"
+
+QA_PREBUILT=opt/bin/${PN}
+RESTRICT="mirror strip" #299368
+
+EMUL_X86_VER=20120520
+
+RDEPEND="virtual/ttf-fonts
+	amd64? (
+		>=app-emulation/emul-linux-x86-baselibs-${EMUL_X86_VER}
+		>=app-emulation/emul-linux-x86-qtlibs-${EMUL_X86_VER}
+		>=app-emulation/emul-linux-x86-soundlibs-${EMUL_X86_VER}
+		|| (
+			(
+				x11-libs/libX11[abi_x86_32]
+				x11-libs/libXext[abi_x86_32]
+				x11-libs/libXScrnSaver[abi_x86_32]
+				x11-libs/libXv[abi_x86_32]
+			)
+			>=app-emulation/emul-linux-x86-xlibs-${EMUL_X86_VER}
+		)
+	)
+	!amd64? (
+		media-libs/alsa-lib
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/libXScrnSaver
+		x11-libs/libXv
+		dev-qt/qtcore:4
+		dev-qt/qtdbus:4
+		dev-qt/qtgui:4[accessibility,dbus]
+		dev-qt/qtwebkit:4
+	)
+	selinux? ( sec-policy/selinux-skype )"
+
+src_compile() {
+	type -P lrelease >/dev/null && lrelease lang/*.ts
+	rm -f lang/*.ts
+}
+
+src_install() {
+	into /opt
+	dobin ${PN}
+	fowners root:audio /opt/bin/${PN}
+
+	insinto /etc/dbus-1/system.d
+	doins ${PN}.conf
+
+	insinto /usr/share/skype
+	doins -r avatars lang sounds
+
+	dodoc README
+
+	local res
+	for res in 16 32 48; do
+		newicon -s ${res} icons/SkypeBlue_${res}x${res}.png ${PN}.png
+	done
+
+	make_desktop_entry ${PN} 'Skype VoIP' ${PN} 'Network;InstantMessaging;Telephony'
+
+	if use pax_kernel; then
+		pax-mark Cm "${ED}"/opt/bin/${PN} || die
+		eqawarn "You have set USE=pax_kernel meaning that you intend to run"
+		eqawarn "${PN} under a PaX enabled kernel.  To do so, we must modify"
+		eqawarn "the ${PN} binary itself and this *may* lead to breakage!  If"
+		eqawarn "you suspect that ${PN} is being broken by this modification,"
+		eqawarn "please open a bug."
+	fi
+
+	echo PRELINK_PATH_MASK=/opt/bin/${PN} > ${T}/99${PN}
+	doenvd "${T}"/99${PN} #430142
+}
+
+pkg_preinst() {
+	gnome2_icon_savelist
+
+	rm -rf "${EROOT}"/usr/share/${PN} #421165
+}
+
+pkg_postinst() {
+	gnome2_icon_cache_update
+
+	# http://bugs.gentoo.org/360815
+	elog "For webcam support, see \"LD_PRELOAD\" section of \"README.lib\" document provided by"
+	elog "media-libs/libv4l package and \"README\" document of this package."
+	if use amd64; then
+		elog "You can install app-emulation/emul-linux-x86-medialibs package for the 32bit"
+		elog "libraries from the media-libs/libv4l package."
+	fi
+}
+
+pkg_postrm() {
+	gnome2_icon_cache_update
+}
diff --git a/net-irc/weechat/ChangeLog b/net-irc/weechat/ChangeLog
index 394ae4de5d79..8360308ea4cd 100644
--- a/net-irc/weechat/ChangeLog
+++ b/net-irc/weechat/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-irc/weechat
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.131 2013/05/14 09:33:56 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/ChangeLog,v 1.132 2013/05/23 11:31:59 scarabeus Exp $
+
+*weechat-0.4.1 (23 May 2013)
+
+  23 May 2013; Tomáš Chvátal  +weechat-0.4.1.ebuild:
+  Version bump to 0.4.1. Fixes bug#470974.
 
   14 May 2013; Tomáš Chvátal  weechat-9999.ebuild:
   Fix various deps and use switches wrt bug#469188. Thanks to tomboy64 for the
diff --git a/net-irc/weechat/Manifest b/net-irc/weechat/Manifest
index bbc9006d8624..8843439b0341 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -3,24 +3,26 @@ Hash: SHA256
 
 AUX weechat-icon.patch 1063 SHA256 520c06905af1f29eb1e77be6b12198cde0de502d58a1906426d537b6aa9fe617 SHA512 568496a36438398b6b1a21ef5ce927c9ebba5732c584ad7fd6dd3a51d82c569cadf8a23cf28f460306c2b93b03876e0281ff556dbe5ca442a220738a31bf5d78 WHIRLPOOL 76c57a8d841c0e0c20040f3c3a85988f36759ee5ee1d0de17fe8420fbae2cd2100d4b11a08052beb85eabbb95089bc39c4aaf5ea0f1f12b2da9834b0f14d9a64
 DIST weechat-0.4.0.tar.bz2 1740361 SHA256 1df12201d8b0ac25f62ddbfb675e8f3d978e52bc5b644d55ccf4c755956fa60d SHA512 41e8a6d0714c6b821b5fd1e9feb0b95be7f142c081ccdcd0e107ce817a5630598c0a91ab0393d8243c3ef41c6f54b62d2ee056924272b389076af20ec99de495 WHIRLPOOL 95a2d5a87d5d27a96c24f2346c4c34d2cc8a0ec45672df3ca7889dfaa6d8fed8b0fe436c2f6c24b011cc8fd9795e59b84215d27852e34566b6d4c0f7b8fb36c8
+DIST weechat-0.4.1.tar.bz2 1772500 SHA256 d27bed07ee2d0638c1683ad18666d478ed9a042aeeedcd0dd9ce22f1392e0ebb SHA512 7b8abef303837d0aee61a113163cecb0834c0dd99b736d9c165e18de8bcd37f9a8307984a4c66038a51262ac15286d44bbd2e53b62ed437d410e4df35292a0ed WHIRLPOOL c6d6ad1f0b5df7936b49332944eb009305e97da573d25bf8f088dd4c5a5d710422ab106c02c9c0fbb64b980e3b9312857b8963bd0691bb8e01f0f62f8c62121c
 EBUILD weechat-0.4.0.ebuild 2961 SHA256 38ae4b31fef2234988484171df4a9954d35dd823cfc82819a559687e46a23cd8 SHA512 87c21424c24425903b455e55b677b0590cca822ddc81dbbcdfec37a141bbfe4830c7416e3b7d3e65d3a4317015ee6bf55f60e066216def389a67d5e6b9f2e3c7 WHIRLPOOL 634c72679335dccbf42fceebe1f298c11b0a66f905396f2c7ccaa24edc10b5145fed148d42d474bdfdd1559e50a63dbed6bab3fb866bdd4cbbb41e1ad2b4df5c
+EBUILD weechat-0.4.1.ebuild 3384 SHA256 17f79e7fd07a1f77cf53b5ddff93d20b94ffed117b5ae9d367fcfc8e7174d575 SHA512 f0633e5aacbf9106dcedaea9962518a125e4ce81ef1c2607cf05f9418da88b3245b6791ed31539f8e077e7bcf08e8173226d197615e6d0ef79437f4dbef5df84 WHIRLPOOL 5780fcc82c22c0f618081287e66fd80fa12e0f3e851d2f331cde85b078183ca59e471d809cf0b672c73c6aa261ad3bebf839adb1c1e1204fe6c99f866d4b65ed
 EBUILD weechat-9999.ebuild 3384 SHA256 2a1aa3e353d27acfeaeecd23e5b94a63c131abb4f92fd7a30e09a2bd0e371a8f SHA512 9e38892cefa4fbbd303670fb867796bf44188b0cd8aa12368d289b8a4b85be08af7974ef2ae5764b5ceee34a14ab16a269eaabf9131b4366c260be48943aacbe WHIRLPOOL 3c5e368d51a322ac40c36dd34feaa4149ff03bd75e6625f25c1e9de87c2a8b5a3dcb5d8c10a5d3a94229027e6d05534a0442827034d453d09e9aadc8b867c1e2
-MISC ChangeLog 18116 SHA256 068833c6bf1daac2944d85b7b1282598712e1ecf0b4f03e2607db728df8394ba SHA512 bce029e6b66b319a63172873176bee4dcfbffd1c3e4598dee0a1ad42b02d25b9f985ab344ae1606f095a301bc3c9325b96eb1ca88f54b9af8c60c5a1759fe1cc WHIRLPOOL 752dceebb91fa053437740eb6c06dc8aecab5aeaa7e91107c2a7f7190ebc20d36550f997c2d7c60664547c0d3e3a78649243d70a1acb993a76cdc42929596eda
+MISC ChangeLog 18268 SHA256 a11a3232703158c15698f9b8648a5a970f1dedfa9006ead4695f85f5f4107502 SHA512 e7cfc1d63ee4c9dc0db499a58901f8580ee87c5c634469b07875fac43d6e1137f418e3b7f7cbcc65de9928d34fb61fa20f7a515a41c39251789fcd2e72baecde WHIRLPOOL c41f55fc5cdb0d448fd5667df873b4598249d56cff05c80b03897e494828273b6f066bd97eb2a355d403bae1a056c53a916725a809fc3159f9105d694986fa2c
 MISC metadata.xml 775 SHA256 baddf6a8f9e77502d45119a96455031b564e19a864c8540e5c44500aeb1ddc54 SHA512 2aad4ad5d7b4634bf06078f62e8bb6a53e19df95257b150b43e82b2fe8487ed37c5311dc15d364cb1f5d5fc3eb04ae933e54cc9e44fcf06a471348021feb4d4e WHIRLPOOL 0a21b77e3c62b2e3e2ce4ee935a7212aee8517ef83445710855823e5a5c146255dc15e369f049ca20503205afac611957394494a857ea2f40371ebc50c87d25a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRkgUJAAoJEOSiRoyO7jvoSsYP/00eTvLe+ykyztQ7hhI2MKbn
-3ZssrzMyqTLocuIqi+76/CIsS18dBG9tCl5R79AnXY0Mls4458vS/eU49zCPCyff
-eRhqqDqyyNtVO91MM/FMJEHsHCAF2UhqCwWhgV23KfeqK9zimV6TlsgvtAJARM5v
-NXAKV5ckJZFZZ5yp7skgtFpk4vr/Zcy9gTIZmPRUk76wFyrULtbj27cSpoSbqV4B
-hMu4XEWSZK5C2AnyjLO3FIly7iwmsZYZhE+X4joI1wTXl3oR04hLdlfm5+BmueHe
-QwOyY28EgIU2f+/0TS0xkJa9ZGZsIbyaxOJfdWgMJ0M7vZHDPzK74Chh6BXdjzut
-z8ChCnTOMokjyOAg6VQJ4dq5ua8PVy6Mp/lNkw29sHfTzrP72Cp6z9j5oF05o5nK
-i5TVyWbD5ZCkHVL6EbDJo3GIgFEHu08P9K/pS4MFgr6JF/k56j28VMS3Xw+FCX0V
-uXMJYo3HDNFqpIp76lLhv3kp8zsYDyDSXfFFBrhpPXNJDwGdtTRdKRmldMahLUNs
-oNqWd6AP2CEmAjvc4cfBdw9Bi/kNy7pXklFWXSykpEPH40nr1Gwn+1wfoFZvHVos
-vPCUAAU9OjNaW6zSHssIBy2eTLF6xBBM0hqHvOze6xuo/wZ9FSH+vlzRFUGWUvou
-L1HvCmnygcDgkoPJHUxZ
-=QRW0
+iQIcBAEBCAAGBQJRnf5QAAoJEOSiRoyO7jvohYIP/1kKwQy9y/Sxo/wo3cW468f+
+9dVxiJLgn6Dya99cMvldQG8kI70O6N0vJjAoRcpNwyY9nnKTSoKpDdX2UPc+rOYm
+dsC9OfZdKCD83tWnIAc87LSuSzue+YydpI4htvOV1RpZZPMyNNoKK5+CESEbE8tt
+KBkU3+qU6f0s3oxTfP7gDtHW9s7pQIUJOt88VeGjgF+i7LKyjILzJW7Yeo0nVFLd
+Z+pmRLMwIk2OrE28wWWHkE7KdDEa5/jpQv5SJSotRxzvWMhod6llz5r/scMOJFVe
+n5myswTNpO2LgMsroTtYPiwGTJOSru7xug6q6+0Xv9L+LQ3ysOWI5UXxnYbtepZE
+D6Q4NeVfkDJ6qzyIbSQFTD9EqTNbHeStQd2dVReipNQ2sp9TBKfz6AB0FkdEiKdT
+jMSNH/3TzPCxgGvgjwiBlhDfCo+WSVH7AH7CBFQ2hMBwKqThDs7G/i6bH+y+gJdm
+23pR7R3/YUXlmG8IbRJMqdH6zQ+qsUI8OeazHX+gwjKiqpaCVUg/UHqAoGR6TNzy
+CyhTuwB2OpXp3OvcvZxRbU0rO3erckr9yZWAy7STdV3lr5gzXsxCD5ZF7a+VHPBe
+gzdpVF9QFYh5vuXIJ/k+gI7DUbjTGzD0zlDxam7vlySJgxq55sCMqWmi2AIm3ncV
+SLgyTwT5bKZH2RYiKtHv
+=bRV6
 -----END PGP SIGNATURE-----
diff --git a/net-irc/weechat/weechat-0.4.1.ebuild b/net-irc/weechat/weechat-0.4.1.ebuild
new file mode 100644
index 000000000000..acbdd800eaeb
--- /dev/null
+++ b/net-irc/weechat/weechat-0.4.1.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-irc/weechat/weechat-0.4.1.ebuild,v 1.1 2013/05/23 11:31:59 scarabeus Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python2_7 python3_2 python3_3 )
+
+EGIT_REPO_URI="git://git.sv.gnu.org/weechat.git"
+[[ ${PV} == "9999" ]] && GIT_ECLASS="git-2"
+inherit eutils python-single-r1 multilib cmake-utils ${GIT_ECLASS}
+
+DESCRIPTION="Portable and multi-interface IRC client."
+HOMEPAGE="http://weechat.org/"
+[[ ${PV} == "9999" ]] || SRC_URI="http://${PN}.org/files/src/${P}.tar.bz2"
+
+LICENSE="GPL-3"
+SLOT="0"
+if [[ ${PV} == "9999" ]]; then
+	KEYWORDS=""
+else
+	KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~x86-linux ~amd64-linux"
+fi
+
+NETWORKS="+irc"
+PLUGINS="+alias +charset +fifo +logger +relay +rmodifier +scripts +spell +xfer"
+#INTERFACES="+ncurses gtk"
+SCRIPT_LANGS="guile lua +perl +python ruby tcl"
+IUSE="${SCRIPT_LANGS} ${PLUGINS} ${INTERFACES} ${NETWORKS} doc nls +ssl"
+
+RDEPEND="
+	dev-libs/libgcrypt
+	net-misc/curl[ssl]
+	sys-libs/ncurses
+	sys-libs/zlib
+	charset? ( virtual/libiconv )
+	guile? ( dev-scheme/guile )
+	lua? ( dev-lang/lua[deprecated] )
+	nls? ( virtual/libintl )
+	perl? ( dev-lang/perl )
+	python? ( ${PYTHON_DEPS} )
+	ruby? ( >=dev-lang/ruby-1.9 )
+	ssl? ( net-libs/gnutls )
+	spell? ( app-text/aspell )
+	tcl? ( >=dev-lang/tcl-8.4.15 )
+"
+#	ncurses? ( sys-libs/ncurses )
+#	gtk? ( x11-libs/gtk+:2 )
+DEPEND="${RDEPEND}
+	doc? (
+		app-text/asciidoc
+		dev-util/source-highlight
+	)
+	nls? ( >=sys-devel/gettext-0.15 )
+"
+
+DOCS="AUTHORS ChangeLog NEWS README"
+
+#REQUIRED_USE=" || ( ncurses gtk )"
+
+LANGS=( cs de es fr hu it ja pl pt_BR ru )
+for X in "${LANGS[@]}" ; do
+	IUSE="${IUSE} linguas_${X}"
+done
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	local i
+
+	# fix libdir placement
+	sed -i \
+		-e "s:lib/:$(get_libdir)/:g" \
+		-e "s:lib\":$(get_libdir)\":g" \
+		CMakeLists.txt || die "sed failed"
+
+	# install only required translations
+	for i in "${LANGS[@]}" ; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e "/${i}.po/d" \
+				po/CMakeLists.txt || die
+		fi
+	done
+
+	# install only required documentation ; en always
+	for i in `grep ADD_SUBDIRECTORY doc/CMakeLists.txt \
+			| sed -e 's/.*ADD_SUBDIRECTORY( \(..\) ).*/\1/' -e '/en/d'`; do
+		if ! use linguas_${i} ; then
+			sed -i \
+				-e '/ADD_SUBDIRECTORY( '${i}' )/d' \
+				doc/CMakeLists.txt || die
+		fi
+	done
+}
+
+src_configure() {
+	# $(cmake-utils_use_enable gtk)
+	# $(cmake-utils_use_enable ncurses)
+	local mycmakeargs=(
+		"-DENABLE_NCURSES=ON"
+		"-DENABLE_LARGEFILE=ON"
+		"-DENABLE_DEMO=OFF"
+		"-DENABLE_GTK=OFF"
+		"-DPYTHON_EXECUTABLE=${PYTHON}"
+		$(cmake-utils_use_enable alias)
+		$(cmake-utils_use_enable doc)
+		$(cmake-utils_use_enable charset)
+		$(cmake-utils_use_enable fifo)
+		$(cmake-utils_use_enable guile)
+		$(cmake-utils_use_enable irc)
+		$(cmake-utils_use_enable logger)
+		$(cmake-utils_use_enable lua)
+		$(cmake-utils_use_enable nls)
+		$(cmake-utils_use_enable perl)
+		$(cmake-utils_use_enable python)
+		$(cmake-utils_use_enable relay)
+		$(cmake-utils_use_enable rmodifier)
+		$(cmake-utils_use_enable ruby)
+		$(cmake-utils_use_enable scripts)
+		$(cmake-utils_use_enable scripts script)
+		$(cmake-utils_use_enable spell ASPELL)
+		$(cmake-utils_use_enable ssl GNUTLS)
+		$(cmake-utils_use_enable tcl)
+		$(cmake-utils_use_enable xfer)
+	)
+
+	cmake-utils_src_configure
+}
diff --git a/net-libs/gnutls/ChangeLog b/net-libs/gnutls/ChangeLog
index b0ab15ab6c3b..937651edaaa3 100644
--- a/net-libs/gnutls/ChangeLog
+++ b/net-libs/gnutls/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-libs/gnutls
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.427 2013/05/22 10:10:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/ChangeLog,v 1.428 2013/05/22 18:32:22 radhermit Exp $
+
+  22 May 2013; Tim Harder  gnutls-3.2.0.ebuild:
+  Update nettle dep (bug #471022).
 
   22 May 2013; Tim Harder  gnutls-3.1.10.ebuild,
   gnutls-3.1.11.ebuild, gnutls-3.2.0.ebuild:
diff --git a/net-libs/gnutls/Manifest b/net-libs/gnutls/Manifest
index c6e4e3ec5228..405df3ec9e0b 100644
--- a/net-libs/gnutls/Manifest
+++ b/net-libs/gnutls/Manifest
@@ -14,17 +14,17 @@ EBUILD gnutls-2.12.20.ebuild 3610 SHA256 785c319b735c8536cb34683fa863a6768cd0490
 EBUILD gnutls-2.12.23.ebuild 3399 SHA256 0e8b84dd493bd28b51bd537752c617eab98c594e977d54f90335f9245b9eb12c SHA512 0f04211be9c0c2e300e5fa9f38e929b431f4e2c8bd01fc9084ab663b83df5c0e6ad887486fbed8c58ab1796c9dad4ab11b2cfaa9461130f74b8ac79fda0c03d3 WHIRLPOOL 4a65b2be4be506aeb5e3c70ce58b6261ce2c90192f49bc98dfa15fae0a047ceb63b6df2587c6a1c337c5a072eaf2daadd4aca7a5dd6b0af1ead6512c9538c444
 EBUILD gnutls-3.1.10.ebuild 3105 SHA256 3de13cda34823f32af94dc57496e3f203d07360fbe80f9c2b1a2c41979c8d4e7 SHA512 fe41d8b2dcb5251928f3914f7432178a614bcc13f074e19759068e407279fe97a81fb9c95d753f6738a4a1e23bbf02c8ad784b4c6f49afe68be8ad1bb996b608 WHIRLPOOL 2099a745b0f2a6282dd10efe86fa7c0d9c676b902f2306252b7198d85096acefd4f097bd4d8ffda4733e37ea755771fb7b838ac0ee1587542e30bc9f4ef2f484
 EBUILD gnutls-3.1.11.ebuild 3105 SHA256 fa4874cb1d172fa8c438415107b8b6919584d0164e29f8239692be3266b59646 SHA512 699f607c897e186147220e4cab8f77622baac15d2c4487d2dc5d9016859c6b56fbe799a374cb89442049dbe34a340dcf5b8b2fbf8db82e83807458b7c459716e WHIRLPOOL bcc20ab4ea9f25a475534d99ec693ee1f5dbd1cddd2ea73cc3ca794caffe322a2f30ab70f4ac2e2bbec08f1c35373025426f6b2740b7ec01978edd5caf8857a5
-EBUILD gnutls-3.2.0.ebuild 3104 SHA256 4030f1ccad0fb04fc23e0853c1addfca22ddc9123461f0510e0ed5926e091caf SHA512 24bf09cdb45530bdd6d56a45da1eafd6c11530f7cb77164732d7ca33bb142389eab47f2e1da829ff072f128b8f024609b71ca7708333066b25a7b3423b2d3be4 WHIRLPOOL 342a7f2617ae2a5328010213eae5db891868ebc85a22a03e3fbafb547b081d4df062dfcc0b5364a4ffbc0a31edb678a5f70153409a02107a1237ae20a6d4e77f
-MISC ChangeLog 63570 SHA256 520cadc9f94eca527d107708d1cbf1527f6e470b2f816dc5b3acd30fca6e7a9b SHA512 bbe1cf700fbb4dd1ac5e7c79d3bdab3e1bfffaa3a5edde39662de58b4436315402fecd77c3e4bcc4e7925d3e0b20dd77fa7e62d95d85f68867f31ff8171b0361 WHIRLPOOL 2ffceb6926ddad949b37aab684ea3fc03af92cb28b81b80850a73708ec55a11552138586be670942971e596a610e7a9127dd60e3eea38cbcab1d01192428a7fa
+EBUILD gnutls-3.2.0.ebuild 3104 SHA256 b744a7ad6a1bf01edd56617e02f0dce5071dc16b8b044370346b23ecacd5864c SHA512 eff2466762c523a59e1e9b973de72646c488e63af233b6a96da5f4235136e8b49b9f4f81a7e6da7d956bf15c8a6328598a3453467e4c5b74544bd2e72ec6b27e WHIRLPOOL 360be8202e1ae70c1132f3cbd9c9085e35705f856ca7fb180016162274c7994565a61c1f196b6ab4bcba385658a61ccaeca3a60d6c59bbbfd1770cc158159c88
+MISC ChangeLog 63676 SHA256 4665b3b4f53a1a97fc328cc531575fc6dd91123076d471685bb9bd9dcf0f24ed SHA512 465f4530f4f2f24ffefe748b31a008a7c479e1a00690e483c4c6cf758d002383425b9a8f76f171f6304dc28d9c38adf0299d6722d467e97922f8ff789b0de15f WHIRLPOOL 772767d7dd16931f5c77feabd13b12cf6b9956a2f52069fce77cc48db84cec9057f093c76623ed7469bc6e9e13a653a40a72ab07025c995f8ccc604180f652b3
 MISC metadata.xml 756 SHA256 508edf0b40fd5b36f9e173fc16c9f8983e2fa11d71fcfb427c09be33f09e5aeb SHA512 c752dce48775632e1ad674f2a3f3195c6c68bc3130d5bf38ac63835763181f18105b932b2b65d143872f6eea0de1166f039e280d8b34e340500cef81fa4adbd4 WHIRLPOOL 5f95630b2551b6661a157a0c232f190f7b9647b8f526b6ee4812e36858fcf11ec0452e0519edbfef8591452ac20c68c95d3315511ed42bc7366f48baec76716c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRnJmkAAoJEEqz6FtPBkyjnmMH/2HrHRi/yHB+vYci2lLXdCrb
-GN9s943KTTjOgu6icjZn7bjuDgvPPGOvWaCIR6rT/IPXr3vNG5yAurJ7+gbS2xxF
-NFbUVPijXMK9NNRgMQw3f6kjGyOdpYkvrcLkJYLv+cDf4a9y12Kd6Z2NFwIN7W7Z
-D4iABS83rwEIRd25G06TsWrWR2gZcNPFE1p81UXMAa7tK0wGWOIWsAqXyMJKJ5ga
-D5BxXZC0dM2M25ecml0UoH0k0eSj0TU9KRhy/1GxIKdcicXOvMI/FSkDO1pGH8+J
-me9fk1xm0cmhSi5MC+iLhAzT/gFq0QrW5116vQbYwEgl8JzTdfVqnVlwlk+IU4Y=
-=Fjzy
+iQEcBAEBCAAGBQJRnQ86AAoJEEqz6FtPBkyjq/0H/0ru8hGVdXVtX8WMCZPyCV2x
+D63bsiAX/fndFfnqqArrYdY7uLnsJ6GN4YNAcu0L/b+bFHi6PAgdbaSRW3MjaxvV
+Zy1BppOAON5EDSga1SbWIlM/CbpQwcMzNt9VjfcKsKILImBaHsueL8pIcymZevJx
+DuOy5S9xBGBTyslD5Dgw10/YHtmi5if4z9Zi6AV4GMTusmM4rAQMAzpkSysxrBqp
+6ABI8AHwy/4VTxY1NZmKCaSmfa7lYr9k7vo5mLGz6QQbfiUd60HeDiPhFbDuz6WA
+ZbiQTKl+xPC+nn4sjsEk4xv1vBwiPcTd0ZfdklLw9EOQFR9qgAPruO0jtPAEB2g=
+=rTUg
 -----END PGP SIGNATURE-----
diff --git a/net-libs/gnutls/gnutls-3.2.0.ebuild b/net-libs/gnutls/gnutls-3.2.0.ebuild
index 636ed5950d4e..26968744715e 100644
--- a/net-libs/gnutls/gnutls-3.2.0.ebuild
+++ b/net-libs/gnutls/gnutls-3.2.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/net-libs/gnutls/gnutls-3.2.0.ebuild,v 1.2 2013/05/22 10:10:43 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/gnutls/gnutls-3.2.0.ebuild,v 1.3 2013/05/22 18:32:22 radhermit Exp $
 
 EAPI=5
 
@@ -22,7 +22,7 @@ IUSE="+cxx dane doc examples guile nls pkcs11 static-libs test zlib ${IUSE_LINGU
 # NOTICE: sys-devel/autogen is required at runtime as we
 # use system libopts
 RDEPEND=">=dev-libs/libtasn1-2.14
-	>=dev-libs/nettle-2.5[gmp]
+	>=dev-libs/nettle-2.7[gmp]
 	sys-devel/autogen
 	dane? ( net-dns/unbound )
 	guile? ( >=dev-scheme/guile-1.8[networking] )
diff --git a/net-libs/libkgapi/ChangeLog b/net-libs/libkgapi/ChangeLog
index 7f470f6edca1..c37f4c0900cf 100644
--- a/net-libs/libkgapi/ChangeLog
+++ b/net-libs/libkgapi/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-libs/libkgapi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/libkgapi/ChangeLog,v 1.14 2013/04/02 20:56:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkgapi/ChangeLog,v 1.15 2013/05/22 20:02:31 johu Exp $
+
+*libkgapi-2.0.0 (22 May 2013)
+
+  22 May 2013; Johannes Huber  +libkgapi-2.0.0.ebuild,
+  libkgapi-0.4.4.ebuild:
+  Version bump. Update HOMEPAGE.
 
   02 Apr 2013; Agostino Sarubbo  libkgapi-0.4.4.ebuild:
   Stable for ppc64, wrt bug #462890
diff --git a/net-libs/libkgapi/Manifest b/net-libs/libkgapi/Manifest
index e87812183b18..91d073e4227e 100644
--- a/net-libs/libkgapi/Manifest
+++ b/net-libs/libkgapi/Manifest
@@ -2,23 +2,19 @@
 Hash: SHA256
 
 DIST libkgapi-0.4.4.tar.bz2 50992 SHA256 2decce55e5872dc3f5de6b227bb03de8649d0890f6754126595e4b1a93548bb1 SHA512 f11a67f148e9e3b64ac01a61e4b43a21858faeea57cc263a713e73c74bea0ef5fce75984dcee845d0da19eb019275569aa161d83ffb465f6039638ccabd7db1d WHIRLPOOL 968cee0b6c9f17b7ec6d4ced65dbaf738bde37f9eab5c5434f7002efefc7d887dc0906af1fd472a678fdccb7571a5201e8175741c46a2c178d7c0e22a00c2e6d
-EBUILD libkgapi-0.4.4.ebuild 786 SHA256 389448b51d69918509654a63f0c592b0abcb2de8e887aa12acf266c671bcc564 SHA512 75e92493a6049dfbf86d2d22a1875f85392ac2f43bc9d60225a55a5c0ed79393a9a23f58808da0c0bcb7fc65fb46c356ecc2e165471483456ecf0c6e3ac4ba35 WHIRLPOOL ecd314e2c6365a985e1413f5ebb114447fbec70e7ea6201ed6855dc0b1fab4c9ad999911448cacb7f9633e128ebe81789f66278969e8595dd84ace223f93d49c
-MISC ChangeLog 1835 SHA256 1cb229ad39221f9ca1b0adac919de209eb4e64dddc8d072f30fb3788bef6796f SHA512 0d2d3a1a8c06269f5e6e6bca0e52cea8c59c84d37a7a99b20a9306966359af892ea15b85a95603b89c1c0b59c6b48c556e1ea972621ab343e2754fb8ebe3f535 WHIRLPOOL fcfe21daf51bda34f12f0ba613a10073b8b86813c9b41a2e488943a52611440da358e03f867d0f444487def1f9761866c3533e0e4581e8fed217a9333cfe2479
+DIST libkgapi-2.0.0.tar.bz2 112492 SHA256 ea3fe10553b965f66bbccae7aa2b5c0ee4536a309b65c9c738b536bc0770d451 SHA512 b3ade1c42c78e89f0968892a0df804a1c9c401d5cf6012d56036364dfb36d93285b0089b445da223af704c493fb663b8d65efb5e93579f69f2df2ca4c706b0dc WHIRLPOOL 9a258e87d95343195875890dfff6f085a38d4f7d7e6d1163f12a9f62afc5acb179457d6eb60f2011764e019e7c5e9b9d40069bd19a4743182a3410094c989c9d
+EBUILD libkgapi-0.4.4.ebuild 825 SHA256 9e9823d7f0034c6bc4427e8245ddff92474ab93ee3428760f6bd5465b7182aa2 SHA512 3e7dad17047fe189f8eff2aa58125f7cbacfe2281e0b77c64c86ae517d5106cb1b74b46ccabb56752a83cfa012ebc861ee2c487749918cfdbeff68df708b2e43 WHIRLPOOL 2aa0cf127250b11a30af5c0b31ff8ae03ad397fc876ee78650d3c673632fb6573d2e1f0d03285809c7009162f3e11ef41b3ddde4e5dfb1fbbad32b62f1b1ae26
+EBUILD libkgapi-2.0.0.ebuild 863 SHA256 37dcffe18498bd164f208a02b2106fc9aa7d5ee24a3ef083af1b6dbc770f2b9f SHA512 d49984de543607fdf70d04553a2be95980254ded48cbe7dc037f0752b6dfe0f595f92471f775b2c3b455462e619232ab573b42b8d02cc7a1ac32dd60b9864f2d WHIRLPOOL 280ee7aa1eed9d26b40fe208e5d31fbc3e5ed9b1927c73a5f7f1ad4554e17d4a2f6b7668fc386047e7062502eaeb1df1bf28aad95863fa6fe66359e6b627ea67
+MISC ChangeLog 1998 SHA256 9e97ae0f5e2643de25e37f1453f52bc54c62b53ab801ae5702ab10e429b5d703 SHA512 265d9895ba07771ce64631458bed1a2c5249408d5b9505847ce4cedd05b76544d4ebed5239ca519f4ef006b12de42c0a040f4c750d619027932c737190739983 WHIRLPOOL a3c60fed4004ffbc23aa62f6300abbc25d004433aa4605d5aa0d3a739b0ff9ca0e2f804e2414fe139f7b7d2a0b0ca66e84d3a06a70df7f2b5ef726b5a9fdb18f
 MISC metadata.xml 245 SHA256 c0188ac055a24e3db8b82ff768bec9698e98255a6d7fccf2f32087dbb43a9050 SHA512 ec9d7b330088a3f6654056d70f5881597552ca40891913482064582e1212621ff09b1fb9316d355883d3b57d5b2c0ed2b60f8b99515619a5fec5d07416e7f90e WHIRLPOOL 5bb12516d921e554a0dc583d2fab74c4e37ec1a557eba4a7ecc7a9b3d9b6822738c329191e9f889022f0b2f130d700c6e2a066ad86f67bec98540dfe2fef23a4
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRW0YOAAoJELp701BxlEWfTHQP/ihM8486S/zcR/HXGQDALeUT
-kApkCGZkPlWsZAd4auyVdClBqAE+iJwy+PQmrISccpkecz+iV8CjIRPd9IWIahly
-Fz1wrwwdmvJrimPzjqQwbHx4lDRDgRP5PSpzJZXi4VStkuRHLbCPYAT9jwWUppbh
-Fd0eKN4xMig8BLdsUvix/fB125w0qiCL0Z9sd4MjRy8dca7qnDFeiNrZhkiuND64
-ooz7BGYH3H6qSesK8AHtIZoBBDebbLxkllwswxWx6HlXYB/VkfMoW0lNWj/0Ije7
-dZq+M8CVU80hWEbQ6rW6yELDuazc95X+0WKkUe8kykCAmeHkyk5ONJD+ahCn/4vZ
-HJlYqiuOK3w0SO79cqt2eaXRLjbOrEhD07mFdi7zShd6q/lWmWwqnnFCZoLEfaGn
-evIGIdVQafkiumRVV8PCa+KTc2RG6KN6XpLtzkoDXSL79W5orrFuEqAzZbhzoc3K
-e7wbhZ28zDOFvnfUylr66FEsag1Pb35Jus8wufH0xuEmwvv0NHe9AitVl2I7D3Eq
-bJ3RJW2xZcJOOHu7DSmX82lql04MroZXlDvE/hlx5CnFEqkWMKYxSdwmPkqvUOby
-SihUlNausB29OLXcJfwuUq8czLDbo5t0zk8w44tDv8tJCJmy+t5ADRlMBpzicn89
-gWAmzFDTCGlgDCv/bO4a
-=YXur
+iQEcBAEBCAAGBQJRnSRgAAoJEO+t9ga+3I3aA+cH/1rfKxYv+/3AQe6kRT8pDJzu
+EzzAbYjbI66dbsIu6NdFa25alhIGV+eKCyRLRiQXsSNE5LVoRszcU3w3HMxbfA4Y
+m2j3lihJDlBr7dFldlvO2Se3chpATv8KqDjeD+Ne0kXl19zUh2Ne4g9tBwEAhCVA
+644v5GLHKL++lyoG+VhrcTrvX3n3EkthHtjE8onBKIZGGi63J/VPgb6Vyw8IY8HH
+n6RDdojQfTVkCtNWggptGZ5vP+T2drzfLsZNwCPrOJa8bkPg5Etn7XzDi04rxrvM
+s+YDxAzjRqsSDDH3KWKZTMtHiNgZOfEOjwNvh0y4MlaHuqDq1bFHtEGKyjq7jiY=
+=bWM2
 -----END PGP SIGNATURE-----
diff --git a/net-libs/libkgapi/libkgapi-0.4.4.ebuild b/net-libs/libkgapi/libkgapi-0.4.4.ebuild
index 4c748673be23..c747a760eb60 100644
--- a/net-libs/libkgapi/libkgapi-0.4.4.ebuild
+++ b/net-libs/libkgapi/libkgapi-0.4.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/net-libs/libkgapi/libkgapi-0.4.4.ebuild,v 1.6 2013/04/02 20:56:43 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkgapi/libkgapi-0.4.4.ebuild,v 1.7 2013/05/22 20:02:31 johu Exp $
 
 EAPI=4
 
@@ -10,7 +10,7 @@ inherit kde4-base
 
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
 DESCRIPTION="Library for accessing Google calendar and contact resources"
-HOMEPAGE="http://www.kde.org/"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
 
 LICENSE="GPL-2"
 KEYWORDS="amd64 ~arm ppc ppc64 x86"
diff --git a/net-libs/libkgapi/libkgapi-2.0.0.ebuild b/net-libs/libkgapi/libkgapi-2.0.0.ebuild
new file mode 100644
index 000000000000..1e9086e73380
--- /dev/null
+++ b/net-libs/libkgapi/libkgapi-2.0.0.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-libs/libkgapi/libkgapi-2.0.0.ebuild,v 1.1 2013/05/22 20:02:30 johu Exp $
+
+EAPI=5
+
+KDE_LINGUAS=""
+inherit kde4-base
+
+SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${P}.tar.bz2"
+DESCRIPTION="Library for accessing Google calendar and contact resources"
+HOMEPAGE="https://projects.kde.org/projects/extragear/libs/libkgapi"
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+IUSE="oldpim"
+SLOT=4
+
+DEPEND="
+	$(add_kdebase_dep kdepimlibs semantic-desktop)
+	dev-libs/qjson
+	oldpim? ( dev-libs/boost )
+	!oldpim? ( $(add_kdebase_dep kdepimlibs semantic-desktop 4.6.0) )
+"
+RDEPEND=${DEPEND}
+
+src_configure() {
+	mycmakeargs=(
+		-DKGAPI_DISABLE_DEPRECATED=FALSE
+		$(cmake-utils_use oldpim KCAL)
+	)
+	kde4-base_src_configure
+}
diff --git a/net-mail/libpst/ChangeLog b/net-mail/libpst/ChangeLog
index be26bb839c5e..cbcd56daee73 100644
--- a/net-mail/libpst/ChangeLog
+++ b/net-mail/libpst/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-mail/libpst
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.41 2013/03/26 11:41:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/ChangeLog,v 1.42 2013/05/23 06:06:08 patrick Exp $
+
+*libpst-0.6.59 (23 May 2013)
+
+  23 May 2013; Patrick Lauer  +libpst-0.6.59.ebuild:
+  Bump
 
   26 Mar 2013; Agostino Sarubbo  libpst-0.6.58.ebuild:
   Stable for x86, wrt bug #463120
diff --git a/net-mail/libpst/Manifest b/net-mail/libpst/Manifest
index c0931c73f1f9..3306d8a5ac1a 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,28 +1,10 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
-
 AUX libpst-0.6.52-no-static-python-lib.patch 449 SHA256 38d477f58bbc4f518cc79dbe322c475bfb3829cc5daa93cb6ccf79da92e36656 SHA512 9cd44493406a58c522fdfe9423a7b15548af7e06332289c98fc1054822d209aa112d497622b3578531147934fd82335bf8c68cc8e371e31ef4716fb51cb26273 WHIRLPOOL 7cb36c586e9316d0e395a6b69330f80c544f37f7a05a35c73f358334eec883b3637bb5b12c32a416d2a7e9445fff563f3e356e9a006ad25659ac6d592d33af8e
 AUX libpst-0.6.53-pkgconfig-static.patch 211 SHA256 abf4dbfd38287db637a5ad22a498c5decd00f44ad9a0f734f65220a4c94c22fb SHA512 eb8d95b07dc96435b7d753c1ea68dfb419867b7b092c3f243de9b5983af29ae368e7e5f3a4ea5a802c82c41a2096bd01564f7f74cd733ac038abb263b6ca4d1b WHIRLPOOL dcd1e14ee2f8cd7de99ef662704c1a0b6e5856182e0914bbf516dc5072a2c6dfaf3d044826c8e4f864627274b64839ef996b4388040e7ef66dd6704ecc4d1d56
 DIST libpst-0.6.55.tar.gz 13444072 SHA256 ef69d87ae5e28175c2abeb8ae5e714eae218a0c950a5071a16fefb851e2912c5 SHA512 5f797484d70c8a00be1049722809bfa1f879fdda3620c8b01ce1888988aa206ff5a2b71e5d53b5546cef24b8aa10c44b722b1998f9e187493a564318e6c22758 WHIRLPOOL c8dd98ec4904a290d7b42f3d9dc092a6d7d7f48473608f389fa78e8da2f142104a20646feb23c0709740fbcb5b9d0f0eba85fdef3a7e763a9b9950b315fd53a2
 DIST libpst-0.6.58.tar.gz 13903372 SHA256 585222d78ce288b390bea4e03b0a8d394f66a944db5a85d9eaa34a50cecd5cd4 SHA512 aed748dc5d4e126fa712f756afd985ac26ea3e934b5fbd99352bf0c3d7486bd560249ab44b6daf91535d6fa82c942598fa528bfea872c2aca1b079d54a2c8d0d WHIRLPOOL caede778ae62a8a9aaf469753c1444de4be5ae4e5fe1d1bc6721bc9838f538dca074c9d36585e07b752707aef0f584bdb9c0a7907d3bf1f2743cfdfa655386aa
+DIST libpst-0.6.59.tar.gz 13904462 SHA256 b02733c95196b81635d088dab2a7e1e1321ef357bb27d5d0996ea82b16bc15f8 SHA512 5d69660f7490f0acdda9519f20f6853769feaca4c033adb37dc2662f8edcb0c3fb0067fe8941ad728832ad16dcaefb3f406fffcc81a9aebaa67fc2d4138ed83b WHIRLPOOL 498022ac84f127fcf85ac8002726dd147212b1f2e9103f74453f26bb69223d34398aa7fd8f7bc5670362e1015c62680de6bbe79f9b975fa20ea3dc86193294ea
 EBUILD libpst-0.6.55.ebuild 1592 SHA256 1c100b53e22d532e9c5fa6d1d9ef4a59c37338d1b43d2df8e80e97c031d1a69d SHA512 0d9af2f6b74414aea823ce26028fbc5ba4186e4bf31453def5b4012d28a28eb0f3fa135677f59f24f8b0b0b93c250dbc4c729a0455b5e0d4afa1fa2f445bb324 WHIRLPOOL 03eaac795bffc648baf5fbcac4604cec3bef3436135e68ca99ec0c78a5663b7f44232e182ba5c68836250e2eb988f9798a0068ac07ba8101f00bb56c864cbc3d
 EBUILD libpst-0.6.58.ebuild 1612 SHA256 110c8a781502b33302d02de5f89d4eedbbe296932d17a140230191975c7f19a4 SHA512 a9e5a8e25507a3a1486c7bb79a2094245a623a7341f9e82fa309c67435de80aa57a89ea0647aa6b0d26ef977948f16123fe77d32b2fcd4f83708c6f125e39cd1 WHIRLPOOL 3fb1ec2155811558df5605cdf2c202d50fe75def41af9c5363b6a3c2464029ba9590a3916bd44d9bb5ebc49b1c3310d3e9cce18fb27422b19fe5eaa6d714c0ae
-MISC ChangeLog 6176 SHA256 10537ae777a7989fa22b66226491b029d478892fcdb8c37970ca207e440abb2c SHA512 2220d2afe1f039c57e62ec35f36f72f3c2d4c33069a0d42a6409369a62a3cbd5652f3e1da6e1427d9941323084654ca174054f3536d6f110ef928c802faa8646 WHIRLPOOL b52148b267cb9df35cb2ab0691dfab13302a2b282aadf79ba1c7f428b08f7a7b97651386de0acfd3e1591d37d824e7bae66aa8b0f6132197f3a17947bb86a266
+EBUILD libpst-0.6.59.ebuild 1618 SHA256 a9469fcff5e5d87c2dce7b4566aa981cc80e4b47f2e0696f9f844c2dbe312238 SHA512 fa3699ddb27d5dc67f07162f6b4b2a7cba5c3cab6f8079a0936509b53a82155d1f1ea70faf822ba8ff8cde2afa560b7902dd53d4f972db1bb16fb95da3716f09 WHIRLPOOL 3527dc5849680addd7949802b545f1e904125c8823e7f208aaa3b47481dc124aeb8362c161119fe1ae2432f283b48bf17645659d008cf0b7453867404c706d02
+MISC ChangeLog 6291 SHA256 67a25148a731b7a1a3fb8ec0c4a056d7edf56e62e8762ae16d8d2f7ea198a016 SHA512 fce63c03498de1e6750458b12994eb256251604c24eefac3cf5cde6ba369a80b589702e40a2076c10ffbd59cdaf6460a9924af4a2330d4c30583eff6eb05e7eb WHIRLPOOL 1ba147776df71b553b118b68afe3cfe39ec5298aebcb991dfd2e258c10c85bfa29b337845fe8f45dfafd51cd885de17f17ed27adf5290cbb243fd259201aa0e6
 MISC metadata.xml 227 SHA256 8627e4b3c97288567f379156f258e1e2e76f1570bb6abb583a80631b83b21873 SHA512 38394e6d478ccf56c05a5bcc2d44d1872e3ce3e654a4b9124505cd23c8b063a5529e311344c4214409c0126886a2f4ca69db26d6279889624c4005e1eae889d0 WHIRLPOOL c2a8102ca5fa9340917d08c298fa21965a5e4f07dc90799144e5fbefb66878dddbcb0b68b9e587a1b8138ba51383532f43353cf8365d064a9bc65d9cc1ad0fcf
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCgAGBQJRUYlpAAoJELp701BxlEWfzw4P/0Mw5AfNdJTUBKJx8YDeNwNN
-qXN8bd+RodEyz33OZySlLdt+gGIITBqz5uBzKQ4hr+/upzoECnxAD5WH/ls0jemJ
-aOJbByViSVssQoeBjvaMI47raANemH6ChLKwapqnCxnLJhZOVyjDhDHWsS02QCi5
-wsA9CqnLggx2oaXTJmw8jhE2S89/vWk8UqMh+BDarjQCTkKAwRvCdnrlGe8vkyHd
-SrVa2PxVf4PFm/fAmWXnNm7QzFr2ZMH86ny7NilkwpDrCSjpS6XVjfpL3ZjHxKoh
-uDYAggM3D8ZzCUY2pWD3w00/spQ0d/7aSMTpfOfsgDS8o0ZXcgM9nLa6PcSgf3Z7
-ddwKz9GWcflaBJPXgTmRsgGv5uFXwqPdI6rfpx46zojCrfUXmRqJXvWX1vb8a2q9
-JNdeOG95HLPvnt7z2U6JR8k2qftVqliwrzB0KKUx6c5GI+WnNAMIPvgxeWsQbX0C
-7KTVBDP9Uj9XsOx1wau2Rel1okja+zb3WWE5BtRIpcgCmsETRRYcsrnbr0NdMx+9
-gqeG77XvHKb600344zuLxeomoTqBjLUlL8voTaXT50hQhItEJTCnsOCF+RzCJt/T
-53v5MONF+gnp/V0Iy7BCjnXrFJnCvKcCSMlc9S9wSSavXE0u2VRsxjby0uYEenLf
-Ff1SL2RUCM6cBLGtDn2A
-=sc+v
------END PGP SIGNATURE-----
diff --git a/net-mail/libpst/libpst-0.6.59.ebuild b/net-mail/libpst/libpst-0.6.59.ebuild
new file mode 100644
index 000000000000..b9dfeef47396
--- /dev/null
+++ b/net-mail/libpst/libpst-0.6.59.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-mail/libpst/libpst-0.6.59.ebuild,v 1.1 2013/05/23 06:06:08 patrick Exp $
+
+EAPI=4
+PYTHON_DEPEND="python? 2"
+
+inherit autotools eutils python
+
+DESCRIPTION="Tools and library for reading Outlook files (.pst format)"
+HOMEPAGE="http://www.five-ten-sg.com/libpst/"
+SRC_URI="http://www.five-ten-sg.com/${PN}/packages/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug dii doc python static-libs"
+
+RDEPEND="dii? ( media-gfx/imagemagick[png] )
+	gnome-extra/libgsf"
+DEPEND="${RDEPEND}
+	virtual/libiconv
+	virtual/pkgconfig
+	dii? ( media-libs/gd[png] )
+	python? ( >=dev-libs/boost-1.48[python] )"
+
+pkg_setup() {
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+}
+
+src_prepare() {
+	# don't build the static python library
+	epatch "${FILESDIR}"/${PN}-0.6.52-no-static-python-lib.patch
+
+	# fix pkgconfig file for static linking
+	epatch "${FILESDIR}"/${PN}-0.6.53-pkgconfig-static.patch
+
+	# conditionally install the extra documentation
+	use doc || { sed -i -e "/SUBDIRS/s: html::" Makefile.am || die; }
+
+	# don't install duplicate docs
+	sed -i -e "/^html_DATA =/d" Makefile.am || die
+
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--enable-libpst-shared \
+		$(use_enable debug pst-debug) \
+		$(use_enable dii) \
+		$(use_enable python) \
+		$(use_enable static-libs static) \
+		$(use python && echo --with-boost-python=boost_python-${PYTHON_ABI})
+}
+
+src_install() {
+	default
+	prune_libtool_files --all
+}
diff --git a/net-misc/apt-cacher-ng/ChangeLog b/net-misc/apt-cacher-ng/ChangeLog
index 6c1b04449537..c6bc9c8af382 100644
--- a/net-misc/apt-cacher-ng/ChangeLog
+++ b/net-misc/apt-cacher-ng/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-misc/apt-cacher-ng
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.22 2013/05/14 14:21:23 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/ChangeLog,v 1.23 2013/05/22 14:23:13 jer Exp $
+
+*apt-cacher-ng-0.7.13 (22 May 2013)
+
+  22 May 2013; Jeroen Roovers  +apt-cacher-ng-0.7.13.ebuild:
+  Version bump.
 
   14 May 2013; Jeroen Roovers  -apt-cacher-ng-0.7.10.ebuild,
   apt-cacher-ng-0.7.11.ebuild, apt-cacher-ng-0.7.12.ebuild:
diff --git a/net-misc/apt-cacher-ng/Manifest b/net-misc/apt-cacher-ng/Manifest
index f0259e8c3478..666a7e45e8af 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -7,14 +7,16 @@ AUX initd 830 SHA256 d9fd5c213c65f74779f444337fec93304771f4bd560baf712d1f6e7c04f
 AUX logrotate 377 SHA256 6f1624d655383452a6d56d69327d41b80379cc667ad2d481ca94f8ea78f7a65b SHA512 c2f4be7294953a63a89e5beee40029e03faa1db49986a6f8d974def67b064d391be13ecddec0d6b4d7ec369db6dcd0bafc328e90b54ccec911df739c719fd885 WHIRLPOOL 80037bc359ffb860ce19e2493d10597f81e02138368ad2bce002da8f4a725cdeee61662478efff4755f0f8a0c9f376263fd6b56505eddddd5c18c1a33f7d22b8
 DIST apt-cacher-ng_0.7.11.orig.tar.xz 258920 SHA256 b5597afda202723f693f9c33a848a383eee2b447e0487fe70fcb623deb38b707 SHA512 fb4cc8e16941256ae384d3fd8d545e12f5ab81060e82c569e003601f1c0f6156c064939eb88d45c9698928095bd498779293078637ddc2273eb8f151c09ddba0 WHIRLPOOL 1cceef5f1ae1285074e4fd4e4fa5bce59659c89e4b81eef24cad9a0b4e07addd674d9cb27207db0c6ee7ca8bada3095eda1aa367f16b06cc07c21fc7bb275b82
 DIST apt-cacher-ng_0.7.12.orig.tar.xz 260456 SHA256 8d5e30c754278adbe43f54cb6efdef16158c3a29bff2f2bdf7892c4f916394ac SHA512 e6e57722a670fe866f7db60d4795fe1b55e47a3b918486044fb2a01a528812aae131b554562053b2ea6085a5a308d6659d11d1e560696d84499aa6fe28c78bde WHIRLPOOL cf93faeba2ad924c53118aea8f0ec3d9ef3c74dc105df48278d83fc96e8ee7b4e4ec7bf52369358d71748bb24736865a87dd1bd7b28ba4d4e0732033fddd9dbd
+DIST apt-cacher-ng_0.7.13.orig.tar.xz 261040 SHA256 f3b6a96aea98cbcf1839109f15db668ea8891264145cdcdc9a0dd5460814db14 SHA512 b29f35cf65312790d7533c170d95e71008826ee12accba6cdf865e18e0e8084184b8edbbe61e75b6eccdbc8eb3649350ab8e1f4f9412bc28669293120ff82fd1 WHIRLPOOL e03e15c77a91d7a2aec77ec5065fb253e2fd3554c0a914e7868841da51ef9441ab922b1400bc2d51ea11e7a7993dab2e97d47c320a8dda21613051f0b50e2472
 EBUILD apt-cacher-ng-0.7.11.ebuild 2361 SHA256 9ea28bc1cc069d64bdc95306988d0978720dad32248dc5393dab181414d38718 SHA512 531b43d95d0a2595f3f92ba48afce1195ae70d76a6993c6780e0c75eb82fe3f50ac63f29e6fa74504a46b6dc2e2e076504d4f5d8000c61b1049b963eed4d32e8 WHIRLPOOL f0f25e70293654c5bf788d6f882368370e982512965d795fa26026d1df7a5e7ad95020600ff12b97dfbba6bef84652f1656a5c2696a47430feddbc9683b6579f
 EBUILD apt-cacher-ng-0.7.12.ebuild 2358 SHA256 1238562fecb4f1206a2eb672453ec630a636ce61fc7e3856bb2a6b4a95edaad8 SHA512 88f4b58cdab69b7c90b737600e11dd38d473fc3e2563948c10aa2cd39e2d44f04fac2e0e734f5d017254e4acc2db015288f24b1be0fa4cca62d31a1c996eb711 WHIRLPOOL e671289d3fe29eb47bf61a89f922a0c6f02e0b0388cbcf27d795bf582e0f7f16dc52b7839c357a66bbf0e96613d92223d9a11758e28a83d1f2cf2d8aa0230659
-MISC ChangeLog 3759 SHA256 f1ca332a563dae192d0b40edcb09961a85a555ec3255c38621e3f717c764167e SHA512 fa6a4088750bc163b018bc8a6674b192f6680b7993228537d4cf559f078b8609c80c196fbad59a22d845f6e1f376a2e5be768fada63c8ee8b0422cd1aab6c305 WHIRLPOOL 6a6dbd30b13c5509c4ef4ca305db54db87f22a18aae51ac92a258b6fc763410ef7ea092ccfc9fa2dc123d5361580897115b2b8b4cfa2b595d39fe787f6a7b4e4
+EBUILD apt-cacher-ng-0.7.13.ebuild 2358 SHA256 956056701155241d890b6a0145d0cdc662eac72e4bea10d13974f338a448c72c SHA512 998de478b3db54dd9fe19852136a4f81914d84d4b0119831452fd077e59af76c6446cb53afefe57a889ef87f701dea0f60f1bfef3eeb557efee42a4c580662b6 WHIRLPOOL c33c752123dbd17cfe5307f9982c0aea944cb0eaa1da48b13b35da53222dbad0b9e665cdee6cb48ab45193e9cb9f31d385b782965ef0686e34c90330820e26d0
+MISC ChangeLog 3890 SHA256 c7349f17a5301a8b2ccd5771f95901bcf5b780023fcd62b40f13554355319c60 SHA512 268ad814045b5016f801422e6ff0a0ec16fe84715cee4042aff9034de45fe272e29d030917d24f335c10bb02534444d14ce9265732ae3194beeed2dfaefeee64 WHIRLPOOL 3fd8c1eceea63ce5e2c6443be73ba98054116f8b68a007635263da31c62c82682f8795d3fbb4a041d06bc0199784ae51ca7b35649a98a379afedc162bf6965fb
 MISC metadata.xml 387 SHA256 83e4af4a9dff85e9d5d58a7704abff4dad046540b992c819a8203d529673e6d0 SHA512 5208a00d95e1f640eb0e10bd448f90465fa61eb3b9139406287af49b14511ead780a7bf613924b8e41dadba6fb1da2939683fe64ee97fb27ef2baaf494331c28 WHIRLPOOL e8fa3d5a1b746fb808e082eec20f734d4d309625f4f485df443f477a79d4f9fe358935cab369c7311f9432366a0e5fbf8ecb1a3377393ffc43922af265983de6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGSSGoACgkQVWmRsqeSphPmLgCdFTF57U2pTMdUlBNnlfKWtCdh
-QEoAnRCoettzt+26XaNBDUCKdqhWweCA
-=DRwk
+iEYEAREIAAYFAlGc1NIACgkQVWmRsqeSphN7HQCfZmYLLkGl9deP6cmzPw6Up7Hp
+dckAn3M58YVJ5WNYEFwUl5N9G8M7k/Bh
+=7rbf
 -----END PGP SIGNATURE-----
diff --git a/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.13.ebuild b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.13.ebuild
new file mode 100644
index 000000000000..c409d9c1cea9
--- /dev/null
+++ b/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.13.ebuild
@@ -0,0 +1,110 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/apt-cacher-ng/apt-cacher-ng-0.7.13.ebuild,v 1.1 2013/05/22 14:23:13 jer Exp $
+
+EAPI=5
+inherit cmake-utils user
+
+DESCRIPTION="Yet another implementation of an HTTP proxy for Debian/Ubuntu software packages written in C++"
+HOMEPAGE="
+	http://www.unix-ag.uni-kl.de/~bloch/acng/
+	http://packages.qa.debian.org/a/apt-cacher-ng.html
+"
+LICENSE="BSD-4 ZLIB public-domain"
+SLOT="0"
+SRC_URI="mirror://debian/pool/main/a/${PN}/${PN}_${PV}.orig.tar.xz"
+
+KEYWORDS="~amd64 ~x86"
+IUSE="doc fuse lzma tcpd"
+
+COMMON_DEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+"
+DEPEND="
+	${COMMON_DEPEND}
+	app-arch/xz-utils
+	dev-util/cmake
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	lzma? ( app-arch/xz-utils )
+	fuse? ( sys-fs/fuse )
+	tcpd? ( sys-apps/tcp-wrappers )
+	dev-lang/perl
+"
+
+pkg_setup() {
+	# add new user & group for daemon
+	enewgroup ${PN}
+	enewuser ${PN} -1 -1 -1 ${PN}
+}
+
+src_configure(){
+	mycmakeargs="-DCMAKE_INSTALL_PREFIX=/usr"
+	if use fuse; then
+		mycmakeargs="-DHAVE_FUSE_26=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_FUSE_26=no ${mycmakeargs}"
+	fi
+	if use lzma; then
+		mycmakeargs="-DHAVE_LZMA=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_LZMA=no ${mycmakeargs}"
+	fi
+	if use tcpd; then
+		mycmakeargs="-DHAVE_LIBWRAP=yes ${mycmakeargs}"
+	else
+		mycmakeargs="-DHAVE_LIBWRAP=no ${mycmakeargs}"
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_install() {
+	pushd ${CMAKE_BUILD_DIR}
+	dosbin ${PN}
+	if use fuse; then
+		dobin acngfs
+	fi
+	popd
+
+	newinitd "${FILESDIR}"/initd ${PN}
+	newconfd "${FILESDIR}"/confd ${PN}
+
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}"/logrotate ${PN}
+
+	doman doc/man/${PN}*
+	if use fuse; then
+		doman doc/man/acngfs*
+	fi
+
+	# Documentation
+	dodoc README TODO VERSION INSTALL ChangeLog
+	if use doc; then
+		dodoc doc/*.pdf
+		dohtml doc/html/*
+		docinto examples/conf
+		dodoc conf/*
+	fi
+
+	# perl daily cron script
+	dosbin expire-caller.pl
+	exeinto /etc/cron.daily
+	newexe "${FILESDIR}"/cron.daily ${PN}
+
+	# default configuration
+	insinto /etc/${PN}
+	newins conf/acng.conf ${PN}.conf
+	doins $( echo conf/* | sed 's|conf/acng.conf||g' )
+
+	dodir /var/cache/${PN}
+	dodir /var/log/${PN}
+	# Some directories must exists
+	keepdir /var/log/${PN}
+	fowners -R ${PN}:${PN} \
+		/etc/${PN} \
+		/var/log/${PN} \
+		/var/cache/${PN}
+}
diff --git a/net-misc/rabbitmq-server/ChangeLog b/net-misc/rabbitmq-server/ChangeLog
index 92b8a718767c..89eca7585093 100644
--- a/net-misc/rabbitmq-server/ChangeLog
+++ b/net-misc/rabbitmq-server/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-misc/rabbitmq-server
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.28 2013/05/21 14:20:50 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/ChangeLog,v 1.29 2013/05/22 15:14:54 ultrabug Exp $
+
+  22 May 2013; Ultrabug  -rabbitmq-server-3.1.0.ebuild,
+  rabbitmq-server-3.1.1.ebuild:
+  fix #470944 thx to Heather for reporting
 
 *rabbitmq-server-3.1.1 (21 May 2013)
 
diff --git a/net-misc/rabbitmq-server/Manifest b/net-misc/rabbitmq-server/Manifest
index 2a9f4dbcc2d6..3722e8a4cde2 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -7,19 +7,17 @@ AUX rabbitmq.service 314 SHA256 a1444878e941541cc413b9a7c50057e1374bddf858eccf64
 DIST rabbitmq-server-2.8.7.tar.gz 2792978 SHA256 0726e126896abbe30d9fd491d13eb16afa15327a548a3de9c3a31d41adcaccfc SHA512 89c39e8b7062adf716eec5195db5eb359418e50b9294d525dd0a6c045987799ef6493560bfafbccb3e25321808385b07988bc7723c462d3b4ee2a59b421f5a3d WHIRLPOOL 3e89e1345aea46de4540b26d45b8c4734f17a9822eea4794b04d8b7cd145c33c4f0768f11941b2ccae1e1abdf3d6a60bc80f770767bfbd1194f7dccbd11f315a
 DIST rabbitmq-server-3.0.2.tar.gz 3314346 SHA256 3d654b0d6fd8c95b37bcc32578b4af9198aa6fd53305316846e6c85b25da98f5 SHA512 8a4012e1f21fa8961e306e5daec9e85caa47ee6142475b34968ee90f33152ae6077919feea68e5031edc9e6ef8a41f2c80f0a819fc2eee4a3a26da11565d8da5 WHIRLPOOL 6be132db4f38e8f1e305a3e83d72c1042d45a3bc441e2945d05d671baf1714dc3289ac51088dd0ddf77ece0fbc8bbfa8ec686c6ea3a2ffb214208f6b3e620732
 DIST rabbitmq-server-3.0.4.tar.gz 3314866 SHA256 e49dbcfd8b2085133847de33081e2defb1f4879d21a9776d54ab1f1988e0e163 SHA512 7a44ea24f64c9adf0d19f787f071c9fc9be6cb0a47f7487e26eb6c526e0c35529d0a0a4d8c7ddcd11de4141808e60aa8cc89b4ad4f7b1c2dd5601f78fa49692f WHIRLPOOL af79667c48cb411b66e404ad21942f3ec4098f0f0e42b7360d830ec9ea88d5a1359d4a2ce74af2e45fbbbad5507b827170d17928b40c24a3e346e734f6337228
-DIST rabbitmq-server-3.1.0.tar.gz 3526907 SHA256 8c37b7b35af28b251c6f58d2ec4a99f3cd624b1786fdb58350d7d9c5ea68bc1b SHA512 94205649c5e2eef6ba062da223a94c2dd9b15d517268efe0f15212c2285784ea1ff22ae02711da7066300165049a4d003d2c8bdad3442e9aba69333653df2346 WHIRLPOOL 4aa911a523c68a2c9c9482bb96b1e2a17d7fe4ea311734deb14df18bd1c6275c83a456e431bd3c0e3ed906ecad15744781235c5198e626416d39976b0149ac88
 DIST rabbitmq-server-3.1.1.tar.gz 3528942 SHA256 960834fb2337c216e6aa445fe555a3bea68ac1d50d1c2d832a495b324e666603 SHA512 5fe3417940fe80082146b9477aaef08b7ba8f46ecd995dfb012d0d5b93e4bc08eabd380fc021cad0e53c5c689d615d48cf31d8a8329c9cdd4f835806b84879ca WHIRLPOOL e74926028d8ef5febb0807652125a86341c11fdf5b83e99707b63a93ecb49abb92fc13ae004da94e681cbfd06b31f147b5da9ff66470c5d35329f615290f95fe
 EBUILD rabbitmq-server-2.8.7.ebuild 2432 SHA256 bc2e8dea466042fe2887fd15d1f107a97077c992bab14c3a754b0e7ca97176f5 SHA512 2a8c48724f34fb0917a71ee681b2a344731d6e971efc31d348f7fff53b518dfef8ab286e0400b71ec5f1f61e58831990f471959f66edd6da07383065b2ac14b4 WHIRLPOOL 4aa17dd304bfb314f5e830a74495558b1418533b7ecfeb99962d4eaf036c926f8f816a93bbf7e3da0a9237af39d30d17ef74f571638fb71628eebfb7971ed1da
 EBUILD rabbitmq-server-3.0.2.ebuild 2656 SHA256 2907847ff3c4eb55b640579e3a728c981dd6b9af22af78e06f95358ea7b98f9c SHA512 0679d37d1d2e72391f8d31ffc630dd27f049929fef5730f962db0ea82d967c21efaaa155e94b1dc50353e615059fc8645bf9059428b0a33933dbbae19cce3fc3 WHIRLPOOL fa6787e6ff300f9ff5508e458a98ffc84e318d3c99ccd882388c3eabcccfcce5f8dd2f962d97983111b3621044940cc103c4e898471c5562e8e600c9a3385c0b
 EBUILD rabbitmq-server-3.0.4.ebuild 2656 SHA256 c72a1b61d5c7581d908f1dc53f0fdde09d1251cd3ef3365da1ba32b58ced2814 SHA512 7cd6b673dffa451c6ce1939e7044d122d2d2f5195bc0e3bdfecc73eba7e6e5445cd0912f382b6d46efa75bcb6bcec0281afc799430aaee65c24f5a58dc92f5a4 WHIRLPOOL e3e9b130d77de2a63a0526ca89bac7dc781cc158c28e776e0e9842a62db62944896a582078337f1776e47a7f638191c7de9edb2a889c73d7474577f803e4e3a1
-EBUILD rabbitmq-server-3.1.0.ebuild 2669 SHA256 d34f2150b85aa71f0f4b198bf2d1fc8f33b0273df71ee7156b4aa5935992cbc0 SHA512 b1aa974c3c5934f48509f605ba4a86e8bbee812c97eb742f5681ac24725cde4c0daf522fb12a4cb986d5fc296cfacc90355a9650eaa81ed578b5e1c564ed85f8 WHIRLPOOL d6b0a9d63d1e23104434521caeabaab23cffed347d09896b242edfaaa0fa81e136d5e403fe40476508183d736222a89ea2133162064e068cf054fdae58ea8c28
-EBUILD rabbitmq-server-3.1.1.ebuild 2669 SHA256 7e8b2fe30ef7a274cc2f461d0081b4564d7ea56994eece7784b7a5aaa48a84dd SHA512 977e7d1be1db2bd3cd20fd590f5b5be319e2612cba343847eea8a487e35ad33718e551f81746b8b0e6a1d9acbd208621620511bf856dcf07209d27d200bbec6c WHIRLPOOL 48f174c6827e50226d9b9f5d1633df1a15284fd24059bb5f43c25ebacb1e5aa47b4cd0bbfc19456c1d4682080d9221693bb1da3f8c14652447850264f43947cc
-MISC ChangeLog 1584 SHA256 07ba5af7a25d43b744701632d4f94f90b41fff3935d93770421139e804f20735 SHA512 0982e9c45ac77804544fdd560e81c6abab255714fae094f8b9db03010d1eb40628c98838ae66403e74504e9d4d20653b2f43a86ba511a607b840550f350522c7 WHIRLPOOL ae3fad9f2a75e0e645d37b6019a4dc2de5547de006fb94fa6b0a9b5206c3285fd732e9fc4071a5c738942630205b08f4d93d0a90c0509cdfe19fc7d3d28c06e1
+EBUILD rabbitmq-server-3.1.1.ebuild 2704 SHA256 2bbf59f83bafcc2c8f76ed1e883d8e0357fe8bca38d96fcd3003c52f53bf277c SHA512 681a1494f13ed32f3fc811640193432495cfe007ff3af35cd1e45221a5c59f89231a68f9e3d264cf2e4d31175e8c69c4434c88e1f40c347444e4bfa31e71e8ee WHIRLPOOL 8513b31161d5067374343698b9cce226cea2af396909c26dc4c1c6b777aaba01508a4414c8ab30cdf780a8483f3b0d0fea71e4de27c22b9010d01ebef6b116a2
+MISC ChangeLog 1737 SHA256 316ce8f7bfb3fdfb8b68adfbe14f9b17abcbf8e0691d0a1294d691c6d0e9561b SHA512 b9d4e1e79ea3cd10ba5c800ed1fd4635fd74f2cd26f7241436c8b52095d794df1ca959d47130e9a85f574191f4904b8c05537b91d66648954d0be68746bf9653 WHIRLPOOL 8b891f8cbed05d5664e51e8bb729e4e4b9e6c3cebbc41e80a9da21618337743295c1a36df16fee1beccedb29e87729af7941e21c971a90855bb1a142323e9161
 MISC metadata.xml 230 SHA256 bd8560ab21232bace10a233ea24414dacb36c87e37a3a10cdeeded266cbb5c8d SHA512 3c7c9badebcc814572f1be89f2cdffaa81f795e3a44ae4f67bc7332927d332844a8a076b0f34d0e84b31db5abef654001cf1e6efff9628fa56a06786c082e6c0 WHIRLPOOL 57f9c4a65d7791075c8859af3cbbff141cc74e426102fefd15029bf1c63d3cf8a2c496eb4fc4f59570d0b84151a0d7a0feba0599827e932702ecfd5b8598563d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGbgscACgkQKiQSS7ZY+hN4NQEAi71eEwgQrR7weh8XoaiLlZQK
-8ZV3r8pmH6YS36ARhpABAMQnU/a31Ztnuy0XJYg56w60zJ8qn58h2dN1MYZg1UOb
-=rTEF
+iF4EAREIAAYFAlGc4PQACgkQKiQSS7ZY+hNEfwD/afORpDPaMqtq4rMlZ1WSkLq2
+PvdpvJgeb0y5yJqDxbcBAMS1th2UO16wFGwOvAuH3J9YPNDRfOh7kVo/SVsrbZ3T
+=/bJA
 -----END PGP SIGNATURE-----
diff --git a/net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild b/net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild
deleted file mode 100644
index fc475e1be2eb..000000000000
--- a/net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-misc/rabbitmq-server/rabbitmq-server-3.1.0.ebuild,v 1.1 2013/05/21 07:31:10 ultrabug Exp $
-
-EAPI="5"
-PYTHON_DEPEND="2"
-
-PYTHON_COMPAT=( python{2_5,2_6,2_7} )
-
-inherit eutils python-r1 systemd
-
-DESCRIPTION="RabbitMQ is a high-performance AMQP-compliant message broker written in Erlang."
-HOMEPAGE="http://www.rabbitmq.com/"
-SRC_URI="http://www.rabbitmq.com/releases/rabbitmq-server/v${PV}/rabbitmq-server-${PV}.tar.gz"
-
-LICENSE="GPL-2 MPL-1.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-lang/erlang"
-DEPEND="${RDEPEND}
-	app-arch/zip
-	app-arch/unzip
-	app-text/docbook-xml-dtd:4.5
-	app-text/xmlto
-	dev-libs/libxslt
-	dev-python/simplejson
-"
-
-pkg_setup() {
-	enewgroup rabbitmq
-	enewuser rabbitmq -1 -1 /var/lib/rabbitmq rabbitmq
-}
-
-src_compile() {
-	emake all docs_all
-	gunzip docs/*.gz
-}
-
-src_install() {
-	# erlang module
-	local targetdir="/usr/$(get_libdir)/erlang/lib/rabbitmq_server-${PV}"
-
-	einfo "Setting correct RABBITMQ_HOME in scripts"
-	sed -e "s:^RABBITMQ_HOME=.*:RABBITMQ_HOME=\"${targetdir}\":g" \
-		-i scripts/rabbitmq-env
-
-	einfo "Installing Erlang modules to ${targetdir}"
-	insinto "${targetdir}"
-	doins -r ebin include plugins
-
-	einfo "Installing server scripts to /usr/sbin"
-	for script in rabbitmq-env rabbitmq-server rabbitmqctl rabbitmq-defaults rabbitmq-plugins; do
-		exeinto /usr/libexec/rabbitmq
-		doexe scripts/${script}
-		newsbin "${FILESDIR}"/rabbitmq-script-wrapper ${script}
-	done
-
-	# create the directory where our log file will go.
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	keepdir /var/log/rabbitmq /etc/rabbitmq
-
-	# create the mnesia directory
-	diropts -m 0770 -o rabbitmq -g rabbitmq
-	dodir /var/lib/rabbitmq{,/mnesia}
-
-	# install the init script
-	newinitd "${FILESDIR}"/rabbitmq-server.init-r3 rabbitmq
-	systemd_dounit "${FILESDIR}/rabbitmq.service"
-
-	# install documentation
-	doman docs/*.[15]
-	dodoc README
-}
-
-pkg_preinst() {
-	if has_version "<=net-misc/rabbitmq-server-1.8.0"; then
-		elog "IMPORTANT UPGRADE NOTICE:"
-		elog
-		elog "RabbitMQ is now running as an unprivileged user instead of root."
-		elog "Therefore you need to fix the permissions for RabbitMQs Mnesia database."
-		elog "Please run the following commands as root:"
-		elog
-		elog "  usermod -d /var/lib/rabbitmq rabbitmq"
-		elog "  chown rabbitmq:rabbitmq -R /var/lib/rabbitmq"
-		elog
-	elif has_version "
+  +ceres-solver-1.6.0.ebuild:
+  Version bump
 
   04 Mar 2013; Sébastien Fabbro  ceres-solver-1.4.0.ebuild:
   Avoid forced downloading of latex style file minted.sty (bug #460170)
diff --git a/sci-libs/ceres-solver/Manifest b/sci-libs/ceres-solver/Manifest
index f7b8b0d7713d..4d6f648a0422 100644
--- a/sci-libs/ceres-solver/Manifest
+++ b/sci-libs/ceres-solver/Manifest
@@ -4,13 +4,15 @@ Hash: SHA256
 AUX ceres-solver-1.4.0-respect-libdir.patch 1428 SHA256 08af3dfe6578c61874a01062f98c20e705b5783c7ee869966a0d1480bf1e77a0 SHA512 a124cc7d2bc5d0ff3592e7d8bf9396df000723e9a5d57afc88ada2ecd9e6a0c9ad26f6d67e3fff2b8e89df71585771c808b0e1dd3739826804e49c0da5579403 WHIRLPOOL c9f76c754ef3133f4f244480c54fff6ccf6e70c99100ecbdcae30ef0ebaee481e7cef87d7ebee2b5295b275daebd72223f073466f6361838f2c04dc7f09a0c15
 AUX ceres-solver-1.4.0-test-no-suitesparse.patch 729 SHA256 6d85e8546a4972c226c51fb760bc1b049ff71fe4275afb3f1f8b98c2a6bcca68 SHA512 dbd39b3e23c56817ec64ae65f3de953b0951c409a89e1df07622243c7729421bbf601c407090280955333e04d70147f6a5d9b150edbc6c4ceb6ca6517720cf2a WHIRLPOOL 3f58635e4a9ea07bd900cf7d1a1e132d180d12afb7254929ff0f43dea557016db453e6abd4ee3b9610bed26e9f172c948dd89a098c17cf394db2e37d51fb1889
 DIST ceres-solver-1.4.0.tar.gz 3659154 SHA256 0a88bbfa20a98c780e4a3371b4f4059d77f7daa0515ef6bb31c25f335bf2a2be SHA512 6489d4840072729652ef95badd7eecf48755dc2d7fce54b7926eab5e3411d6dde20142576683ff45bf649950b445bbb1bead1bad2f10ed63ae319f0f3069cd66 WHIRLPOOL 6f76c0329fda0a31620627b2c6ab777739bea7f11068841f545e2cfc2511e8950a0399a7c4c3cda5152e15676a0a760ce9e7219fd5ed5408a317b9ecb6e96e0f
+DIST ceres-solver-1.6.0.tar.gz 3947640 SHA256 4d0887ec5081505ab73e65a8a70c14b20e0c08ef7075ec3bba801cf5f014775b SHA512 a32556edaf1295051cb8aba29c348dc3a6be3b6be545b219df45a50e222effc7ebe384d9c9fcad33c23b85a75429ad73a5926a7af4a520706bed47c5b52840cc WHIRLPOOL b42610289a5be1d2b1fc381a113c6bd6256813c9364e85152268fce83e9ed7a005580e23324ea3d9cd97d47086c499deb5619ff122f4ea86d763d2b48f241824
 EBUILD ceres-solver-1.4.0.ebuild 2458 SHA256 e0c48f292fe3d804769c303158034176d7a5ddba3734d0dae40aa980f9bf67de SHA512 b075674e3d01c44e7653a17447a320aff1ab2fca694ffa6e2a593bcb19cdc9993ab85de14016b525e99d6d999981f73bb9214393a6a480ce701d5d10edbbaab6 WHIRLPOOL 3162be2f54dbbcb8445eb9c4ccd030f73180289e4e99413468e90fffbc902f2c80e2b1ec96df09db0c0ac7df9e81cae8da061136064b7c6bb8ad49c6c4cbc429
-MISC ChangeLog 893 SHA256 8ae564364873abfef6cfecb34ad3c8cd0a9d7100407ac3b1a3292f47572df387 SHA512 1bb51a48ed498c8694fad1ff1625bca5e32861d96d196589306bd513910078fae0530fc1553d2f6d13f0beaca81ccb60c46ee093dcda66bc45d0a1cfea5cfb17 WHIRLPOOL 65155698da510b191dfa4350cd20ec813e1cfbf2cfa138371fed5925c0451fc59940ad133a8f462ba540f187e1c0d00e49810bdaaeb24124caeb044803761ad0
+EBUILD ceres-solver-1.6.0.ebuild 2261 SHA256 8ae1f1730b4838ce677c2458bffb96894157397e62e9d81b4acfd66aa4069589 SHA512 459131364994e82ebab2701adc2b515b818596fb434c1ff1df7044cba8bb68abbab6c53ed54dce57b57168ca7234f5e4a29b5db406fa8c0f450b63519b04d38c WHIRLPOOL 5aad9128fb705515941bdf2e0d4bf20a38fe0b041b439b192469884e5c650a81ac39378d69954f2579c1400884ed62b81e446de8015a9680c2331e074e7e87e7
+MISC ChangeLog 1029 SHA256 681f2fa59e5a475b368a885249714efa9c128647ed6839cc4958ae50cdf872a8 SHA512 6a3b30ab1ece66f1dc0119b340ca0b8fff3e0a487c776546a70352799b435b91abce60ca40bee6e7a8b76d95b73198a6f3d3a56e09adfe5be7c522921c5809f5 WHIRLPOOL f2f01c4087ecf7a33a200074042aed67d7b766b10b8beafc30bcea1b0c683a3f434dbb297835f6d4bc4d33488458a7cbe523fa6f5f7342aef23810f12e103ffa
 MISC metadata.xml 1375 SHA256 167df44ea3a8a7af388ce00ebbff10b02e2c50418b4137d1446581729e93fb5e SHA512 d1229e9e235f154a7dc29970e1d9f70f6b05400f296f6a99e26d52dd0f6bf517e0e64820f60a3e3baed7c7fb7653bc980539176338b248a55a768de5f6a32974 WHIRLPOOL b78eee2044a9f22ed74dc2cb616c31babf272ffc5bde2be0eddacb434b3efb055abd2166d482083d73d8801ad2cabd4a1e61fc19831addbe66ef98a4cb1326cf
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iEYEAREIAAYFAlE05+8ACgkQ1ycZbhPLE2AWJgCfYi/BBNkoci6hTYfxCBCs23NR
-WLEAn1SGP4WjRVTPBg/3jYZ1bkSANYMB
-=toHW
+iEYEAREIAAYFAlGdNEgACgkQ1ycZbhPLE2ArlgCfU3Wuk9HTHhhYsctCUZfyX0Mk
+HPQAninNFP28J7p8w8PcuJWdBWZT72NF
+=s70l
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild b/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild
new file mode 100644
index 000000000000..91ed71c5669c
--- /dev/null
+++ b/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/ceres-solver/ceres-solver-1.6.0.ebuild,v 1.1 2013/05/22 21:10:26 bicatali Exp $
+
+EAPI=5
+
+inherit cmake-utils eutils multilib toolchain-funcs
+
+DESCRIPTION="Nonlinear least-squares minimizer"
+HOMEPAGE="https://code.google.com/p/ceres-solver/"
+SRC_URI="https://${PN}.googlecode.com/files/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples gflags metis openmp protobuf +schur +sparse static-libs test"
+REQUIRED_USE="test? ( gflags )"
+
+RDEPEND="
+	dev-cpp/eigen:3
+	dev-cpp/glog[gflags?]
+	protobuf? ( dev-libs/protobuf )
+	sparse? (
+		sci-libs/amd
+		sci-libs/camd
+		sci-libs/ccolamd
+		sci-libs/cholmod[metis?]
+		sci-libs/colamd
+		sci-libs/cxsparse
+		virtual/blas
+		virtual/lapack )"
+DEPEND="${RDEPEND}
+	sparse? ( virtual/pkgconfig )
+	doc? ( dev-python/sphinx )"
+
+src_prepare() {
+	# prefix love
+	# disable blas/lapack forced library names
+	sed -i \
+		-e "s:/usr:${EPREFIX}/usr:g" \
+		-e '/FIND_LIBRARY(BLAS_LIB NAMES blas)/d' \
+		-e '/FIND_LIBRARY(LAPACK_LIB NAMES lapack)/d' \
+		-e 's/EXISTS ${BLAS_LIB}/BLAS_LIB/g' \
+		-e 's/EXISTS ${LAPACK_LIB}/LAPACK_LIB/g' \
+		-e 's/-Werror//g' \
+		CMakeLists.txt || die
+
+	# respect gentoo doc dir
+	sed -i \
+		-e "s:share/doc/ceres:share/doc/${PF}:" \
+		docs/source/CMakeLists.txt || die
+}
+
+src_configure() {
+	local blibs llibs
+	if use sparse; then
+		blibs=$($(tc-getPKG_CONFIG) --libs blas)
+		llibs=$($(tc-getPKG_CONFIG) --libs lapack)
+	fi
+	local mycmakeargs=(
+		-DBLAS_LIB="${blibs}"
+		-DLAPACK_LIB="${llibs}"
+		$(cmake-utils_use_enable test TESTING)
+		$(cmake-utils_use doc BUILD_DOCUMENTATION)
+		$(cmake-utils_use gflags GFLAGS)
+		$(cmake-utils_use openmp OPENMP)
+		$(cmake-utils_use protobuf PROTOBUF)
+		$(cmake-utils_use schur SCHUR_SPECIALIZATIONS)
+		$(cmake-utils_use sparse CXSPARSE)
+		$(cmake-utils_use sparse SUITESPARSE)
+	)
+	cmake-utils_src_configure
+}
+
+src_install() {
+	cmake-utils_src_install
+	dodoc README VERSION
+
+	use static-libs || rm "${ED}"/usr/$(get_libdir)/libceres.a
+	dosym libceres_shared.so /usr/$(get_libdir)/libceres.so
+
+	if use examples; then
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
diff --git a/sci-libs/mpir/ChangeLog b/sci-libs/mpir/ChangeLog
index 11f0c5565b79..e356f928bb61 100644
--- a/sci-libs/mpir/ChangeLog
+++ b/sci-libs/mpir/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/mpir
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.18 2013/02/19 16:03:02 tomka Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/ChangeLog,v 1.19 2013/05/22 16:20:34 tomka Exp $
+
+*mpir-2.6.0-r2 (22 May 2013)
+
+  22 May 2013; Thomas Kahle  +files/mpir-2.6.0-gcc48.patch,
+  +mpir-2.6.0-r2.ebuild:
+  fix tests with gcc-4.8 (bug 470838)
 
 *mpir-2.6.0-r1 (19 Feb 2013)
 
diff --git a/sci-libs/mpir/Manifest b/sci-libs/mpir/Manifest
index edd8819cc1ba..c6959d8073d7 100644
--- a/sci-libs/mpir/Manifest
+++ b/sci-libs/mpir/Manifest
@@ -4,6 +4,7 @@ Hash: SHA256
 AUX mpir-1.3.0-ABI-multilib.patch 3903 SHA256 3db2dc41f385d6c8ce9da8406a42072c8462e6e15eba0b6ff93664ef31c00957 SHA512 a1b008f7daccb03a5e6c7af6311d96279ff2d052201f54ef32890ad0404e79e179a0a8d60e2adde5a0b487e16325ce2df4d0fd74464411c983e9630833662886 WHIRLPOOL ae123f02a8e2868f19ad27802042ba45d6e40204ecdf982e346e503ef6808d3f6fafd9b4da336db92164327f2af9e59dfd5e51d97876097ba18a60c30a4ef70b
 AUX mpir-2.2.0-yasm.patch 2000 SHA256 c1d0e2fc1e844dac937dd2019b406a329c0b9696dddb2afa85c8beaf8d312d1c SHA512 92efdd03892b2da3a73872ff87801aec73fda119f6b74ab29e4239c9cfc9a47370f05a56f3fe82158855003fb8d880523ea32f4150c5bae2fc2d720e9bf308f2 WHIRLPOOL ad39be4a12468ca41eb3b76c52175e984250f813d965c163cf99935c0d20eb9f7888a15e6f622a631db3564747497d311b1fec904c1851b8f1ad37e247efd985
 AUX mpir-2.5.1-automake-1.12.patch 3388 SHA256 dc003924094f88d89582a5e4d626e67c6edacf8e81ee5080fff34fae1b9f836a SHA512 d96b238d2a0deaae1d5489121db02766bfde34e602cf137a608a862584192694da6bd61a27dce3294c62cb950fdbc80b71302585f9cf4a2ac0e5f68c48a66846 WHIRLPOOL 949cb479df53d8d643fdefa95199c777516b843368ef7c68e40fc85429c2736a4d62bda469c9b08224016af223617c573795f6d4041045c90997511a0513fd28
+AUX mpir-2.6.0-gcc48.patch 467 SHA256 5e3656543f9a50bbfe063681d1135a33ca2c272bb79c1762a6759d907b601355 SHA512 28d88aa3ac0c9ccdc849e3ca63eb7768efbbcd77947a1d3befd3cb723eae0b3dda0ff8237f2fcccc9c161026e2a3a05d18ba848d55e51002ea31ab9fb291ed6f WHIRLPOOL 62be75abb8b04bd2653780602c31b7834ad269b7be554830e28210c3ae7368c0a38ad8e943c59ffe1a68cf62d682ea0cdaa73fdf14809b6f2840ef35866b8875
 AUX mpir-2.6.0-yasm.patch 1897 SHA256 e7102052ea1bcda73107ec6c89c20a5f8e1233e9b85732d8847e74ba69a322ae SHA512 0ac3f67f9f8e340e02e4e33e84a482388c45cb59c0d62adf316bc94d1450144b0afcaa639ab9f18fe3a5bc74bb6c2730fdf910b036b4a79272aa28276256ec5c WHIRLPOOL eac13201f78bfe52297aa3787d7896f0d1da1d949118991836ef08559a1ec1ad5eba634b8886e47358bed17790ad79aecda028ad9af978a50c7490771c3bd777
 DIST mpir-2.2.1.tar.bz2 3352215 SHA256 172937988ec6d2fba8f280f0e132ab6b8c343c327bd980b69e65163849664372 SHA512 ec5957fc84aca1da0d837974b77c11af85df9522cbcc45be800235ff52b5e3c041050fe249ce97602942c6859c17bd0f90666bb4c150ad4b43be6c2030d0145e WHIRLPOOL e0c9b7d13c4e01e2fbed13f0149a77470ac0779a16c8f9f9d595be03ab57a52e1c3b70d61c2cb4f806c47f05cecf35888985826c1cd74a9812ae3a970ed8317a
 DIST mpir-2.5.1.tar.lzma 2515775 SHA256 70d5855db369e96eb62fa9db06b0930fda4b82a0d9062c208b02862efc2fe4ac SHA512 40af2f6e5ec5e4ad0330538e6e617adc2ae917d608f7130abd9e7cba95659258eb9bd86838fddbcaa942c21d05f059f54772918da05a5940aa00bd43ebc32c00 WHIRLPOOL f12f4a26e0bb9014feeac788ab3db33ddb6f46e06576a71c70c2bcb21bd2fb4f848af748a6610b003a9348e6328390194bb9bffe39431ba273dc327039111d15
@@ -11,13 +12,14 @@ DIST mpir-2.6.0.tar.lzma 2472231 SHA256 2d2cd75a21a73bcd8898f092e4f123016b578288
 EBUILD mpir-2.2.1.ebuild 1697 SHA256 f3c59c5e3f69db7d1bd5d9f8c8658e124a5dfbb0a6839f063e6d5cb383f307f1 SHA512 848fb5c4351f9ae87b4ecb86d0dd6a299dd1eea1c740de0923ad660715a2c5d9fbfc670b64dc9eb76616993d038b1dcd60e8ff1d360843bfb8aa2d034ca92b4f WHIRLPOOL e7cd7d1d066d1824fa436f866443d34e637ef116e75fef7eac34d8921c5f11492a58ebfae1348c10c9ea0ab6123600589a95feb741b756c1c751bcf8851ae5c0
 EBUILD mpir-2.5.1.ebuild 1714 SHA256 d0df3c1871a60f050db1010c1500df0b3a3fb27fff976fd11b88da7b23c8c849 SHA512 6a20710fca5e6e507fcde087900a5da14835ca840c090ab4764472257c7df33872f4fa54ca0e946828fe80fead01894b535e5eec0412aced22f2af282c590a16 WHIRLPOOL 1625271269e619bc4b1a08c7c661f7d362e606082bb60a314cc7bebf00d75b89fdcd71a2ac0f14fe4a3f59f42c62adba972683b52e48d6d9ebf8b7d14a18cd39
 EBUILD mpir-2.6.0-r1.ebuild 1744 SHA256 9fde8e453636d7b039d9c2e1c64ec11b34a0ffe947cd0affa501e52a5d43da5c SHA512 cf85f514323df162d3f9dfe40da8852cedb8be92175cd18757af32451061a67963b64ebc76c2a829e2e6568cc31c661029d38c6c7fdccd425062e1532bf8f3ab WHIRLPOOL 0d35da9c4edbab30c52414cf22097204a4bde65d6f8e51a5252b5b95387c68a3a9f24469137c441f73a32731ed80b4a52b05d90cc3853b2cd1e77d541074e11a
+EBUILD mpir-2.6.0-r2.ebuild 1786 SHA256 a2a7f3955a629c128c1c3d07517e89c79e190bd946f28aeeec64a306b1862fbf SHA512 0a258c0769be3d8bd6db202fc792db63db9ac2180e7e3616de269a2d82ba3c95f9a6908ea3af4cf27705fd1015986d165f2f83e53e55be64c8bba8fa7ad05620 WHIRLPOOL e99867f19932338648c85030796975847b60fc2fd5932dd65f1db8afbc0c501fe5afa3e3d42cefb69392ffcda76569010b5cc4204959f82961b49158912bde0d
 EBUILD mpir-2.6.0.ebuild 1706 SHA256 aa3d3113aa4dc848c8f5345fa2e4ac99bdf51c33884be487fcf2f5d00d81d11e SHA512 e2e3c709b9f95c049c6293ca67fb0dc78bdbafd4efddf9ea95c666856ca8906c7d751a5d9b5982bd293d40aba83f7e27aa7fead9c5a1abbb39dafbf09b9dfb66 WHIRLPOOL 7f09b2ddbcfe9de61684f485fcc958b89c507f2b591634109733aada44ebbd4e79ee00d6c543351f2cda9d473765ca2139e3ee007a3da8be78ea4dd211f93c42
-MISC ChangeLog 2631 SHA256 b7ab2754703cecff31f2185af46ea41aad5bf526e57d6265e4267e5c1661ab89 SHA512 0c0501a5273089ba59fed8ace91b793dc8b4229443b35cd1eb040dc82e34c2cfcb62f1f43985fa9f82518d49aeba52120ff598e2f32f3b1e34ec3d9b7c33468f WHIRLPOOL 01ba24d78332e0081237187f6c5455979e7da4995267fd1ae61d524c089b30593a0c1686a0b59ca74266861386035342f69fab77b93ab9b7d207cfdf5de21aff
+MISC ChangeLog 2803 SHA256 698ad9224aad60a2bf93df5d90f5dfb28c828715be36fb30c8ea02ffbc44d930 SHA512 5255dff6398cf92fe01e7866e1944991ebb76e0eeb55c9ac29ae422385a1163320eb8b33fc8c7a970bb41d24ef18eb791b60db48e6cf196e224b450d11a4bcfe WHIRLPOOL 87f1e6591415140643dfd9ea6e06e01473878c4b5a2c0dba39e2b9ba5d2fde8da8f87b51b5896bb901a953945d4922e23df4d54e0c696e213b4db06da2d641f4
 MISC metadata.xml 784 SHA256 0188fbe61ac973a5d01ef17bc65013d9855f02cdf80870db9cb9e7211d80a4c1 SHA512 505734b0b37cd6c758e26cd5acd26410fda809321768ec09ab97a1572a21407b4c56f8f5782931fb58845ef353471a3c4379ee0cd4b3b48ee6b67ca0f7da8404 WHIRLPOOL 973b88902920027862b727265cb30015ef8ca804ae1f7c3d4a3073d87204f82c5c027bde8cdc8d9019dd1e3ac3ed6bd99ed42d4bd396f4207a7b10687aff3c38
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlEjojcACgkQid6yGVZcMrzE0AEAjUshq2H7CNJJZwz4iEGq1ulF
-YArK/XvGKXXHgrE3CokA+QHGI8CbfxIAmKfHmoOv4dHeAxQnbE2QqwIouHageQbk
-=p666
+iF4EAREIAAYFAlGc8FcACgkQid6yGVZcMrybQAEAqy2h9vXuofVgEGl4Q1VmXRfw
+4TP2GWhS8QcBsaofxzMA/iDL7lVEEjWq+UfTbiALVODTx3lrDZZN6jpAcQPDon65
+=Vj+R
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/mpir/files/mpir-2.6.0-gcc48.patch b/sci-libs/mpir/files/mpir-2.6.0-gcc48.patch
new file mode 100644
index 000000000000..55cd1a087ed6
--- /dev/null
+++ b/sci-libs/mpir/files/mpir-2.6.0-gcc48.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/470838
+
+--- a/tests/mpz/t-scan.c
++++ b/tests/mpz/t-scan.c
+@@ -84,7 +84,7 @@ check_ref (void)
+ 
+               for (isize = 0; isize <= size; isize++)
+                 {
+-                  for (oindex = 0; oindex <= numberof (offset); oindex++)
++                  for (oindex = 0; oindex < numberof (offset); oindex++)
+                     {
+                       o = offset[oindex];
+                       if ((int) isize*GMP_NUMB_BITS < -o)
diff --git a/sci-libs/mpir/mpir-2.6.0-r2.ebuild b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
new file mode 100644
index 000000000000..1381aa6c951e
--- /dev/null
+++ b/sci-libs/mpir/mpir-2.6.0-r2.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/mpir/mpir-2.6.0-r2.ebuild,v 1.1 2013/05/22 16:20:34 tomka Exp $
+
+EAPI=5
+
+inherit autotools-utils eutils toolchain-funcs
+
+DESCRIPTION="Library for arbitrary precision integer arithmetic (fork of gmp)"
+HOMEPAGE="http://www.mpir.org/"
+SRC_URI="http://www.mpir.org/${P}.tar.lzma"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+cxx cpudetection static-libs"
+
+DEPEND="x86? ( dev-lang/yasm )
+	amd64? ( dev-lang/yasm )"
+RDEPEND=""
+
+src_prepare() {
+	tc-export CC
+	epatch \
+		"${FILESDIR}"/${PN}-2.6.0-yasm.patch \
+		"${FILESDIR}"/${PN}-1.3.0-ABI-multilib.patch \
+		"${FILESDIR}"/${PN}-2.5.1-automake-1.12.patch \
+		"${FILESDIR}"/${PN}-2.6.0-gcc48.patch
+
+	# In the same way there was QA regarding executable stacks
+	# with GMP we have some here as well. We cannot apply the
+	# GMP solution as yasm is used, at least on x86/amd64.
+	# Furthermore we are able to patch config.ac.
+	ebegin "Patching assembler files to remove executable sections"
+	local i
+	for i in $(find . -type f -name '*.asm') ; do
+		cat >> $i <<-EOF
+			#if defined(__linux__) && defined(__ELF__)
+			.section .note.GNU-stack,"",%progbits
+			#endif
+		EOF
+	done
+
+	for i in $(find . -type f -name '*.as') ; do
+		cat >> $i <<-EOF
+			%ifidn __OUTPUT_FORMAT__,elf
+			section .note.GNU-stack noalloc noexec nowrite progbits
+			%endif
+		EOF
+	done
+	eend
+	eautoreconf
+}
+
+src_configure() {
+	# beware that cpudetection aka fat binaries is x86/amd64 only.
+	# Place mpir in profiles/arch/$arch/package.use.mask
+	# when making it available on $arch.
+	myeconfargs+=(
+		$(use_enable cxx)
+		$(use_enable cpudetection fat)
+	)
+	autotools-utils_src_configure
+}
diff --git a/sys-apps/gptfdisk/ChangeLog b/sys-apps/gptfdisk/ChangeLog
index 9dc4b58e3d73..667cc617f0d1 100644
--- a/sys-apps/gptfdisk/ChangeLog
+++ b/sys-apps/gptfdisk/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/gptfdisk
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.35 2013/05/12 20:22:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/ChangeLog,v 1.36 2013/05/22 21:35:43 floppym Exp $
+
+  22 May 2013; Mike Gilbert  gptfdisk-0.8.6.ebuild:
+  Use correct ICU flags. Patch by Arfrever.
 
   12 May 2013; Mike Frysinger  gptfdisk-0.8.6.ebuild:
   Add USE=ncurses support.
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 638e48b0a42a..108823ea7cda 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -6,23 +6,13 @@ DIST gptfdisk-0.8.5.tar.gz 183841 SHA256 15cc691f28212c157e05315662ed6b76ffdcc8d
 DIST gptfdisk-0.8.6.tar.gz 184686 SHA256 4579cd54842459699970e24720dda7fb0aa217027818623089c321bc62a647b2 SHA512 ad73e644c664f04524e984d1ab39f006f49c3bd62529ecb982f0dd09ba6aeeeee3f146e22398e03e7fabf25eabe7506ff1db35e90863b3494fdd54a5262d9800 WHIRLPOOL 37253eda2f040c15e5b66ffe243c5b961737733562f57f4e9bcc2dd94c55c1adc9274f4c2db03bd3c817ccd83abb503b4ec5dfb78cb8afc910078fecfd9fe4dd
 EBUILD gptfdisk-0.8.4.ebuild 918 SHA256 a0805f4b511a39cce4ec03a916ff9686ca7e24589786f1e43e683552d7f4053c SHA512 95e095e62ae9262fd5965fe2202ee269d0864e3fa714f0a9ab3549763a0e41d0856b5883ef26b634844ceba875dfc3d4464a1edee00dd802f1b0fe084756ce3b WHIRLPOOL aad8f03391c2a066661f767c125586c52afb2600a571ab2cdaf01363f579fdda7da6781a04274841df6cee3c163f67f871fbb1c0f9f8092d009ea29080a4e8bc
 EBUILD gptfdisk-0.8.5.ebuild 1151 SHA256 982c7d855cb594d77c45f9a5771729e8ba5f4ca5cc37882f77466d092cae1132 SHA512 ff3e40d414c85240da3a43d39b344cfdcea185e55b478b24df9c62f54104b48989ad5f63ee5c016ebd50ebe78db8f662c855f43b5b66d62edf1de4c1bc9831b9 WHIRLPOOL b971b1111a8bc072a3c50096a060295d549cad38c07532995c5b121362fc13e5a8b96c36459c9c289378f843d8141107a1d3bd5b31dbdb458ea1b721941796d4
-EBUILD gptfdisk-0.8.6.ebuild 1479 SHA256 cda247b122c75c029307270c1bcc848b24da0841cccda864a4b279d36b008d33 SHA512 cdd7b2a22ef361de39bb7d8c60fa4626410fa0d2d1224de48968e05b30218a26e6ff8848a519e43dbb7d937183fc15a1f78ec944bb6a4dc0d8019ac16a8f670c WHIRLPOOL 32cc7010a0a2169dc1b01a023f069931a66c16566f1c41d9dfcf1785edb503a29e7c588d290b0171bc2112f68f369f68a19487c2c8dd7b3f66c45191662ad7b7
-MISC ChangeLog 6606 SHA256 4db2fad9a178a4d98374aeeb0f1f3f615dee4dbd96f4e0997287a074a527b691 SHA512 e4caeed304eefa9fa037c2b4bdd0f9cf599a3c5d07aa457bbe01460ef90fa2c7b4ab2703c3e6f4869198b0f2ff41054a3205f6700a88cd1921e4d37f9c1df933 WHIRLPOOL d9021707bb3646a716a505fad266951d0c0d675b53722e31a55422aa64a0ba8414acff2af2c018c03e6bf8bb11432eb27eead69f564b49d6b59e975b5778d60c
+EBUILD gptfdisk-0.8.6.ebuild 1491 SHA256 f9b1f80d3e80d50acf037a2eaf78164bc5392ee17bfa362479cc57b0771477ab SHA512 ebfd5a88fcb362a4e597be7251240c3477cbe21f0e9ed0345984d33ea77abbd939cee59d9ff9c54422fa96e0f6e440df907e39b4624530840f09a482c0576129 WHIRLPOOL 460f5c2281594a7b2e64448a8f3d4f61a914e0c56f479f679750eb444cc0c71b1b22a915f8706eefe3f8ff8df78052c6af99178d2f31165ce040047ae6005c44
+MISC ChangeLog 6724 SHA256 ad5ec5cb6f786e802c890e3ba1f338c02654d330ec21f2e834f37349c7b158d9 SHA512 b038fc15f804d9ed9717fb7aeb1eed9f9a1366bcd106f7013b8f64cacda6150c010a2add43dc9f0b3a5e4860f062e93f00959da0b26cdef3adf91960ead7d48a WHIRLPOOL 05008433daf1c01c29b336663712616be55389adaac8826c3c2d5b6693cfdd2e534f45482f9282ff32267a487f2ae0b688cdc80ad0ff33442adc9ee2439e7f76
 MISC metadata.xml 240 SHA256 f70cde052604926c6ac9b19b6091c308671b91300b1d1d0537f4d590f59d2d90 SHA512 dc32e8e7c987cea9fea95968f1f0d86c6450bba42f3d91c193db041c52f96db23070bc89bb86b212ea4a3bd0844e293daac612661d4e7af26c0c786f671e80f0 WHIRLPOOL 52ed6b39c492f28032bcb2bb024141fc009add45d870ba97ba670c9be2565f7b8171804d7cbf0687673a72c43e7efd143a31fcb14b9ac771ddc2afedf2efd200
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRj/oWAAoJELEHsLL7fEFWV10QAJwh3ahd7Uh03moJz9j62a91
-1sbAFICKNnQFlWaPYNdun4wIO76goeCJ1eKNFoLCmMuvYtQvi+En66IK5JqFxGbV
-Z4uldP1wlTEPZ7ls4PoPjzuudS333ln8CkUobrQDE8jUY2/L6sN/6uOs3EkJb8wu
-2iDz7Icu7lmYzK7Ybx5dckuJlBP3iUCjBVRA9me9GY4eHeYlNHuw/CTrfB9BKaCA
-08RjTfco+Vuf0c/i40hF5Ze6szKCc9QAViPAIIyC3HBlk8l0nGQDNCxQUbWVaMKK
-GQ7XDjE3HCMTePDq4dJwj1jmk5s8LFriSkN9qCVMQnbgurQYogn50wHlV0ry72HK
-gOC8bIUDVHVL+UIbPSBibA/xIUxbw2woEE0UWGnCr9WCpz4xjDXZS6i+nd+0cfjc
-7I9fS6EjlPmRXLFqObBxByAxo3Hf/pAH2fq88WoApi/p6yz8GCmulWqIfrm5Pufp
-i5cz9p4bFO9rkNAb4YNAOCUGG9a8V+BvRVS88/Fn5fyMfJhF86AasTIZX3817K6c
-tzKM8/bbGx+JA7yeZBsn4CANRoNagvJOWnmcK7cUsnLOko9QDRxjtqgtG5JKUaI1
-OXn9GOuhF0gcZDlAB4SLFxP7dMSBFfZhMiA/Lw8HguuKw+fHxcPXsc1As4KvoT3T
-GUDe0Uzfj6oaRejZegqr
-=/7Cu
+iF4EAREIAAYFAlGdOjAACgkQC77qH+pIQ6QfUQD/TG9bJSaV5xiiumBs2dvrtHBP
+JpKRuBhJGzcXM0pEJWEBALzVrlfRd2hsIcylewhsy1IZ0hGz7bcd5QqmeS7XT8rw
+=4vvA
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild b/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
index 653266abf9b1..cac33881e487 100644
--- a/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild
+++ b/sys-apps/gptfdisk/gptfdisk-0.8.6.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/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild,v 1.10 2013/05/12 20:22:41 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/gptfdisk/gptfdisk-0.8.6.ebuild,v 1.11 2013/05/22 21:35:43 floppym Exp $
 
 EAPI=5
 
@@ -28,7 +28,7 @@ src_prepare() {
 	tc-export CXX PKG_CONFIG
 
 	if use icu; then
-		append-cxxflags $(${PKG_CONFIG} --cflags icu-io icu-uc)
+		append-cxxflags $(${PKG_CONFIG} --variable=CXXFLAGS icu-io icu-uc)
 	else
 		sed \
 			-e 's:-licuio::g' \
diff --git a/sys-apps/hwids/ChangeLog b/sys-apps/hwids/ChangeLog
index 56cf129e583b..9ed742669259 100644
--- a/sys-apps/hwids/ChangeLog
+++ b/sys-apps/hwids/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/hwids
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.106 2013/05/14 22:35:19 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/ChangeLog,v 1.107 2013/05/23 14:35:44 flameeyes Exp $
+
+*hwids-20130523 (23 May 2013)
+
+  23 May 2013; Diego E. Pettenò  +hwids-20130523.ebuild:
+  Version bump.
 
 *hwids-20130514 (14 May 2013)
 
diff --git a/sys-apps/hwids/Manifest b/sys-apps/hwids/Manifest
index 0289545e9a2a..9171e784c93d 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,23 +1,11 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 DIST hwids-20130302.tar.gz 1486329 SHA256 2c8bd8f3535d0bb6a0bada65e6499af8ff5191ca2cda44de6228c05d19444708 SHA512 79fe4b62555ef37cef929a9728c093e659805822e8a63e3229bf0d8391d50ce78b8d479a670be06f3da665ed50dcb7e50e56492d3fc03b530aa19b842680b8dd WHIRLPOOL 7ecb932b2eea48b8669624732236a37413b46e0c92ce4b0b3d1e87b8a53bd4219c9db76a535280429be7db1cf5cf2a4bf2f82f77a3f6da3c3aa4bcb31e5e92f2
 DIST hwids-20130329.tar.gz 1498583 SHA256 64714243c366d086e24c6da41c73053b0f0ac47e3566186717591afe4ada6600 SHA512 f5a5c004269cd0ee8c3fd6bc9c2917e856084c3a267b4e35f6d96fbdb3ea36a3f73689fe59ab661faeff852cd016601e0ccfcbf01eef384b711ba6aef323c71c WHIRLPOOL 378ba5760a083beeb5f50dcad1e7faaf7ce6c4339fd73e5c47c7a89878177ebf3d4baf4d4ef7a2966c0df436f449f792226581e277300cc7d4394396ecbf2340
 DIST hwids-20130514.tar.gz 1520174 SHA256 0c413b90db6ad05db71c1377e2d2a9147b4a051621e383e9fd6dc94f97af573a SHA512 a175cb69a00f6798b15f6144af5574e2a6fd310cc527dde045845e9b8c8973bc2d3c813b6182fd6e6fbbb674894ec005693649e56816d3c97be72d03e70b8cd8 WHIRLPOOL 88c50c55054ca317f3002c2dd0cf61b0f931fd2fdf655476fbe379cbe1d432ef280846eab49ee6b5a4214ed9c5d5d4f2404d2f1c4ef36ef220c13d4809fd9a6c
+DIST hwids-20130523.tar.gz 1522551 SHA256 0cbd7f9c107894f0bd267ac01dfd512795dd6575c535504cf9c7e7572581d5e1 SHA512 92e1aa844cc7b9294ea282498c24e013108bff3dde3b5b7ef38e12fad76411b9185ca671b8659db84dba16a6e07b17b46ca49d9633158e5d17d0c11dbb623d82 WHIRLPOOL c92fcd4883cc1bc7864e7c5d23380607b3c6f2616f5cd1687091d7080aca68828928a3dbc2c6916116059229fe91ab54963f466e0c8e9d7fe0dbc371abad8894
 EBUILD hwids-20130302.ebuild 1021 SHA256 ed4aebe5ba0a692b952e75078f89ea2aaf11d967982facb76f8898a12074dbd8 SHA512 e35a3ddb6c7d4d8028a27f0af9093df521ed8b42ee6550fa21b31f9a606cbddb03d966cd257c261e2486241a869084e8a1b8e0b1c28bcec1c09882d6964f78ba WHIRLPOOL 560e5cd2504be8e9117139d0120107c582045d21f5ff8f7cee90e76fa3da9025e1dd16de678f19ddf560475d762427bc2f60cdb1356b39c02ae2e49ad549a9c9
 EBUILD hwids-20130329.ebuild 1152 SHA256 7467d11810c2e1bde074f8cd3334a69d68a6a3657600eb0ab68d95a3222b56db SHA512 65825157b31337d82bfb100f002ef74f0a8c4ca2cf5d53a415c1b33ab6d1c019d907cfae116f018cfc9ca19277f30299a5b3541d17adadc203d3c49ca4252784 WHIRLPOOL d457b1c08d0e41441519c98b2178726d1801b23e0e9b8f63c96566513b85684fb620b96030f48c63feb359727712f4ca0bc489006e4777a2073a29165a3bce5e
 EBUILD hwids-20130514.ebuild 1168 SHA256 19c7e3521349c62852c1609e483a44185027ff65289befa82ef931901acb7fb3 SHA512 488c56aa91c43bb7ee7c71ed6ace8d1a91027af867ca4760cf091260fc78a6a2a5868f98e73d83ca9239133a6bb14aceaf295a262325328dfa1023c27c7346f6 WHIRLPOOL e4f13f5fd6b8e804053c75c899236d7a4f56038f648dafcf9d4e1d466997e89b8f3ee23fbc7f80da2bc92ef4dc62a0737db861843331b07a71da666b39f4e19d
+EBUILD hwids-20130523.ebuild 1168 SHA256 3c86ad27f41120a8d2014b27848b9d2dba859192e182989d2e07cd6c62a68e13 SHA512 434fb0456376b750793aaae8283c67d7d57433b132b2b56537d74125fa2f26021b3050dd2e26feb3fd24a1242f627d894938782ede328cff01ac7a0c9e94c0bf WHIRLPOOL 19a3625f6906b4453885048fe1284a989220bdaf8ff140dcc90cb0dd56cc3f9850032786b1c593a5b1b0e7cfc870f30c95dca0582dd46554fe383b2c7d5b7178
 EBUILD hwids-99999999.ebuild 1003 SHA256 3ae1a26acb92a6fc0c609ba79c9f52c47c72ead9db4edeca911906f930d3853d SHA512 908908ec76e6afc659ad1fab6f9371ade39e8d9c91fd15b8a988a8163702962d1c1632df1b1f173f90d33403ad92e9554637dca2a4f2acba5850b1a26d24d7b9 WHIRLPOOL 3d40fdd1e5d4f9e16a799cd61935492040741b809da2b3661c770bfe58b3c222feb10c63d1bd4040988dc68a2032cae5e64213b14efe0076b7d5e27e28da0462
-MISC ChangeLog 15936 SHA256 77dfb83260bcef458436743934c7372f1f642426ea6fb838a3856c6899aa4e25 SHA512 a63b9c8fc62fb2e8e0cda868a53d452c6009913877e440f15e1924b8a6901c18d46504ebde59dfa4c1612bb73ce535eac344898756156ce982fd32c57a384479 WHIRLPOOL 97624cf8e0ebf8b6bb865da6f930210be5fc9e22de5707606370771767dde4f342eb5592eec1073b341fd7f8d0e1735ad1d6ed8722cc0be0138cd2833715ac7c
+MISC ChangeLog 16064 SHA256 71e02e9778e586aa5c8949a62bfe68bd03209469bd3d38a4a76105b70c3eb14d SHA512 2b83573cf047ea2908c0eb6b562bd292af979a80f44956d6b0fa728d25bea36a14d89a48a8f70d77534188a8ded63189f0b8670655b92502f21f41f8a47a708c WHIRLPOOL 1a39ec6f2061b700867a7c3b28528906e149ad43098e88fd37f08f62088881fa56dc9b97a4f554af11216ae34e7eed538c8eb4b8591444abdba17efa4fe77fbd
 MISC metadata.xml 291 SHA256 6a6fbb9d576c975c7f7f488d478ab1db341ea21397f8cd66dc278b13a13a5731 SHA512 6e0af3b85a3693acd83889dabd6ce589c2c8e3e2852820f1135e2ebbe63cf6dd184fcd45f03b7c4ad35414a43543e8c39c7d1b5fa5f72c0e5db2ef907955e462 WHIRLPOOL 465e5e9b5700d6ed972ba129dc114843ec984f377569dfd81f7bb006717e0dc69181f2ffa31308adef1eab32c032d018e6cf519a0714b0ff21ee303dbf250942
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJRkrxCAAoJEBzRPIrUMBNCGlkH/1jQt982VNqeVZ9EGAje+tXd
-ynl+jCK1tikf4t0/3jqlnsILwW6Gcyu4k6rphweJavfLK2nlMnENEYgOra+2yVm4
-kzCR9Rv4+f1B4XM/CSOzcH6N+QBO4D5fvUQSzwvyfmb4ohPZKmqzrXG9TeHpeCkC
-L1sOSAjhH5XsuCHEV0BGvFDQv1/CHHq3xGl6v8cvm/bJJY9ePKNhJOPVx4eyTwHF
-cvT8Dfv6a7pDW1iNcBLXyoClIf+Dw+lQW+7SusN7mOw87IN5u2ZJAahJvxMChiQk
-La8dSO5pIBc3q1VJhbRDTObx25znpOjGR2x9LxEOU91uwyCLg14hmn1uRDkIVmA=
-=1MzK
------END PGP SIGNATURE-----
diff --git a/sys-apps/hwids/hwids-20130523.ebuild b/sys-apps/hwids/hwids-20130523.ebuild
new file mode 100644
index 000000000000..7bc712d2abf7
--- /dev/null
+++ b/sys-apps/hwids/hwids-20130523.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/hwids/hwids-20130523.ebuild,v 1.1 2013/05/23 14:35:44 flameeyes Exp $
+
+EAPI=5
+inherit udev eutils
+
+DESCRIPTION="Hardware (PCI, USB, OUI, IAB) IDs databases"
+HOMEPAGE="https://github.com/gentoo/hwids"
+SRC_URI="https://github.com/gentoo/hwids/archive/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 BSD ) public-domain"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~amd64-linux ~arm-linux ~x86-linux"
+IUSE="+udev"
+
+DEPEND="udev? (
+	dev-lang/perl
+	>=virtual/udev-197-r1
+)"
+RDEPEND="!
+  +files/lnxhc-1.2-ifconfig-path.patch, +lnxhc-1.2-r1.ebuild, -lnxhc-1.2.ebuild:
+  Revision bump. Add patch to correct references to /sbin/ifconfig to
+  /bin/ifconfig.
 
 *lnxhc-1.2 (09 Feb 2013)
 
diff --git a/sys-apps/lnxhc/Manifest b/sys-apps/lnxhc/Manifest
index 706a05571f26..6fcc8bc0c47d 100644
--- a/sys-apps/lnxhc/Manifest
+++ b/sys-apps/lnxhc/Manifest
@@ -1,15 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX lnxhc-1.2-ifconfig-path.patch 654 SHA256 e9c97c791be80ca6bb3c80c0ca1c8f41e9b9c3e10b7044298f79c12363627b5e SHA512 a29bc332e918e44fe3659f520c32df34ca293edc1545534853495a41182f7e28cb049e20e746f4cbf83c30140f4ae450d034e806a4c87e4d642f4ff2cce27cc1 WHIRLPOOL 8f0a601e79ed8f06a392ff4b4ad5d417526067b89342c690cddd91c4a4ac0931078d52c369a33d41d93de9215c95abe1b55a162cbe76cce77c221bfa4c6dfd87
 AUX lnxhc-1.2-usrlocal.patch 1455 SHA256 62bc5ce12b5ef725aafbfde9e0159948b1ef9d6fe083b9bf5c9c4a665fc1f42c SHA512 43be5d638f46caee028802e8675621a7e6ec8499f4490ed1f9df167a8b9b82a3002bac5a28ab3116507eb0eccaad33d865cb64f6cbc4b134717541cd2424087f WHIRLPOOL 1fd199359cfbb1ad8c8cec266950324bd10ff3442f9fc99542fe9e9b1ecf77a53e0ac37f4236dfca62dd3bd3bef10ca09d3ff5a49df88bb8558167e13dd7c5af
 DIST lnxhc-1.2.tar.gz 360869 SHA256 a94a748171b812528567a0f7a3c19f048a57463cb0fddb9e152b38e2ed8a66c0 SHA512 200ab6443c3b8f4dd99928d2f18b31e8e05c1f9c1f976052017a643430ed87fa08a399e9e8430eafb2925126bd2d90fc4f65ce1c220d6100b71c31fc0505aab0 WHIRLPOOL aa0b7f1f86bae2fce4da3db40dc97c525fb1d94b86298142675d64654676be391487c33612fb8018cae5b5bb1cedd610696092f8ef1944e4ce446f50bdcddef4
-EBUILD lnxhc-1.2.ebuild 534 SHA256 33741d1956ed5413c0927544c0747c92a2a85b81de2ec2f1d7d1899022ba5cc9 SHA512 f38c1e5608c7a94643aaec06772825ce51a93856493fa4124a20cc9896493cb7d81b7206cb9b143b154ad563c0e10ab4d8014c849d08d5b969122af958db3079 WHIRLPOOL 92205388f2a6aae68f6dea19671b79fe96d0bfe1814f141ee18fc64ca045c7bf574f9e283769d25898738e18ceafd87007f1637bd2dc8093c55020aba773d45b
-MISC ChangeLog 440 SHA256 21699b3d720402f5438b8f374d7516d5a190145eb0a5eb46a9372560f4a4ff3c SHA512 1be723a94d20914bea1b091a6d57ca79e853141a9a79fc91632a428c85c948e5bf8445fe47cfd30d921e7220088b89f935c7d206e484d27f19ec74b19e18817e WHIRLPOOL c2363f87a7d8dce691967753304098d10ba5330da2c56eca561d40762552d097adbb2322239bb76eb7ac9702c2671947da9573d6b6de5c65b085138cabae27c5
+EBUILD lnxhc-1.2-r1.ebuild 589 SHA256 ba534c4f51515d8a9798e4134333bfddcc12e313df181d2fe0e4e1030ebd7760 SHA512 41bf82da07f1e3c2f9e5851b8f7dc54c37e52e151101860794e17db67da0965e0d311d4ed7a23c1bed53b5736d7c4cd29329a353d43dc2d8584745abcdf5fa29 WHIRLPOOL 5eb352d0649486460394dbbcd741826215f133a6fe60d0aaba26995d245b90af0818940a0b8fcb04f7d192994e3d97895c654e3cba9c3d5df08d37d716e6511c
+MISC ChangeLog 689 SHA256 aa040391d4c5134dede653875b7aa79191143e01317bad09421ff60def0d3086 SHA512 81e4febbcd161ea416af143a6983d6c2f2deb2a4a1b6152ed267666ffc1f46eb15fb17d9114344b1d8375739790ddf2498fdd1e86b40fb286455ebfd9a5016cf WHIRLPOOL 2ba5d967c7f75a934ba929e68d4c2f7f748d2c629224a3f13f79c7085da27340fc4fd06888160f7a5fae6720da968876c24b01119791bc82b6a39696e21217c6
 MISC metadata.xml 234 SHA256 df736f9d2dfc4890f1bbe65688f46f956d15a4783ae0c3cdf9da324713c63ad0 SHA512 9b555962848efc9ffbd41f07c7eeb9655dcbe1db6f6bfd4d402ae3e31a4f20daeaa84c6dee5067b28ae20b0fb13587dfe63870d81a2b80c5b9c4343f46c6a753 WHIRLPOOL ec944e7712fc4cda2b8ebadbdd58cc88ec801dde7ad7eb55aff93961a5bef8cbf47d92d68327c4f81467b9068965c8ff1557596f6c4d1604c7c5f1e37224cdfd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEWnIcACgkQ23laikJhg1TsyQCfcfg/HFQNWky+umqMEgqJmNwe
-6yMAn26H9BikvE/0H5TmnLdEVwl9SNgW
-=CgtF
+iKYEAREIAGYFAlGdNexfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldEM2NzU5RjUyMDczREJDQkVDQTBDRkE1NERC
+Nzk1QThBNDI2MTgzNTQACgkQ23laikJhg1TR2wCePtafgFCOOff7Jvdv6xN+LNy0
+EYMAoJ4e0CbE+7/JLUCSIOQMXePggNvO
+=L/OH
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch b/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
new file mode 100644
index 000000000000..89e184704857
--- /dev/null
+++ b/sys-apps/lnxhc/files/lnxhc-1.2-ifconfig-path.patch
@@ -0,0 +1,23 @@
+--- lnxhc-1.2/checks/net_hsi_outbound_errors/definitions
++++ lnxhc-1.2-patched/checks/net_hsi_outbound_errors/definitions
+@@ -9,7 +9,7 @@
+ default = "1"
+ 
+ [sysinfo ifconfig]
+-program = "/sbin/ifconfig"
++program = "/bin/ifconfig"
+ 
+ [exception slow_hsi_receivers]
+ severity = medium
+
+--- lnxhc-1.2/checks/net_inbound_errors/definitions     2013-02-06 04:08:55.000000000 -0500
++++ lnxhc-1.2-patched/checks/net_inbound_errors/definitions     2013-05-22 17:13:56.088787813 -0400
+@@ -11,7 +11,7 @@
+ # The above value in percentage
+ 
+ [sysinfo ifconfig]
+-program = "/sbin/ifconfig"
++program = "/bin/ifconfig"
+ 
+ [exception limits_exceeded]
+ severity = medium
diff --git a/sys-apps/lnxhc/lnxhc-1.2.ebuild b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
similarity index 72%
rename from sys-apps/lnxhc/lnxhc-1.2.ebuild
rename to sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
index ca9fd844b91c..d0e5d99241a2 100644
--- a/sys-apps/lnxhc/lnxhc-1.2.ebuild
+++ b/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/lnxhc/lnxhc-1.2.ebuild,v 1.1 2013/02/09 18:59:10 creffett Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/lnxhc/lnxhc-1.2-r1.ebuild,v 1.1 2013/05/22 21:17:35 creffett Exp $
 
 EAPI=5
 
@@ -19,4 +19,5 @@ DEPEND="${RDEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.2-usrlocal.patch"
+	epatch "${FILESDIR}/${PN}-1.2-ifconfig-path.patch"
 }
diff --git a/sys-apps/which/ChangeLog b/sys-apps/which/ChangeLog
index bc485895f9ef..41a44aa049aa 100644
--- a/sys-apps/which/ChangeLog
+++ b/sys-apps/which/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/which
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.42 2013/02/17 20:15:47 zmedico Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/ChangeLog,v 1.43 2013/05/23 03:14:46 vapier Exp $
+
+*which-2.20-r1 (23 May 2013)
+
+  23 May 2013; Mike Frysinger  +which-2.20-r1.ebuild:
+  Update to EAPI=4 and build against 64bit interfaces #471024.
 
   17 Feb 2013; Zac Medico  which-2.20.ebuild:
   Add ~arm-linux keyword.
diff --git a/sys-apps/which/Manifest b/sys-apps/which/Manifest
index 70b27be610bb..5f4a93cdb391 100644
--- a/sys-apps/which/Manifest
+++ b/sys-apps/which/Manifest
@@ -6,13 +6,24 @@ AUX which-gentoo.patch 340 SHA256 8b53ab961fe5d275451900313b64bffa407378ab061922
 DIST which-2.19.tar.gz 132810 SHA256 7d79b874f65118ac846a0deb31a8fbd6816cd81e74930299c82103765d45cd52
 DIST which-2.20.tar.gz 135372 SHA256 d417b65c650d88ad26a208293c1c6e3eb60d4b6d847f01ff8f66aca63e2857f8 SHA512 29445cd6072814d3a6179b53b8f9e7e3fc8a27b77315f2a04171e177397b91ff80a97db8806fc6b1f08dab8cbca6f208d9d7845858268b121b3af396a4a9062e WHIRLPOOL 35ca3dfc47e6112a2827188b979bc19d369f69f5841dca445039036e6fa5423b0e4e9efddd370f92da16a3873523bf37f7bdf68b748fc78e5b7991290875c49d
 EBUILD which-2.19.ebuild 797 SHA256 2f4d079705a963d1b7e570730f2450c50d7a344fae8e78f93149f7f46615016e SHA512 a438d7df1e7dfe46ad8e3c72953fe33d62bfd20160435a90b5bb1248face917404640c43cd329bbb6e6575cc1f0a48db95d15c6784c96175e821c124e83e0e44 WHIRLPOOL d38752db49d82e2831fc72b24d63bdfc774d5f7231543ce4d1b5c6f09939d83945c2881316a192a10f704528465a1d22169e50679cbe2c2431a49ff191b0913d
+EBUILD which-2.20-r1.ebuild 815 SHA256 ead1cce8e9aca5f06096fd275be506e0017c9cb43ceac22d0f277c4788d9c51e SHA512 134e32f0c8e306f422b977b2155f7bea00a00220bab071349125a5452e5698626c0618f262cd79d00fbc75f8309727ead0c58b2d908b1318ac8a9810a4ba0226 WHIRLPOOL 13fd102b3815113494c13af59e29726f322a1dbac86adc13874de9bf4a31524db3076dcb111116ba6fd7eded3a53a1eda10818bbc290f99906ef595c47bab476
 EBUILD which-2.20.ebuild 826 SHA256 90e5e134dd417110433bb8800f1f0828d33ad1b21497421588270d5241a5cce8 SHA512 8ce53bb04081a8e62440456e3bd2d4ce974b3fa76c21b02b72dd04cefbaf796db80ad227bc029c26c3e99b3512ea7ad9b948298c5896dd0c369a1c25fb7b313a WHIRLPOOL 3a886cafe79b8712ad68d319d759d2214cd886ef9aff5207a5937f6b453c23cfd461596e82c9fa55e989db77a46a6c2908af6883038829f3c734341cd871377e
-MISC ChangeLog 4110 SHA256 953398c655ea540bba6d17a34905004fbadbce5ea6d066b400585a33b26196a5 SHA512 97f1dbe68431314b76b314fbe08075a8f3332828c853f4b75b2c08676a1a47a6dbe598db735b216d6075ce51c801401a2df25c1fae95c5e651c9852d125406af WHIRLPOOL f5a79d40eb81b0e5d290626d46fd7e7f57b2ed67fbf9c86fdcf738e4475ac2625c26c078d4af6a239a7a3e40cc1b714daa0c7ab94664b9ca453862d9e0751d8d
+MISC ChangeLog 4276 SHA256 e694f4c6c59ed1b7c15106a60e326d18c5dd4b2b9c4ad2f8184f7e8c5a4e1b0d SHA512 1ac27b662211a59c435ee7c88c08e4f632ed194861eec12eff5b2ca54b000818f453fd95c764823b96ac82bd22d7b06da956cd6b999955fb3d680a025a3888dc WHIRLPOOL ad4965464346c4377552918e064942772c41096e98bd432bfd2dac11710f3e72093c90d47b366d01aba3c6a80309d2e8528ff3a0a26a82b70d138ce137389616
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlEhOnUACgkQ/ejvha5XGaPRogCggVYsHelNdybDRkVl1d0sLJgq
-GlQAoOmOSx23d7KjRqRVAcipAaPMlu4Z
-=AXZN
+iQIcBAEBCAAGBQJRnYmuAAoJELEHsLL7fEFWnCcQAKNGMcev4WQONZT6R+Khz71a
+fXS9UAEA9jvyuQyDKpy3PtkE42D9owjBvD8kl/9HGStdPSQn1B3maSd7VD/AP7YU
+pMjEzDWXKnK7OCButW4V5DuMJfg1ghrnH30cH9KBLroro//o2FJIaPk6/ZYa8yx8
+05HsHUuB3VcUo3FvrxNtkkyrlPiJaL9VgWGV0KryoEX5PWf40M+1pEIXhor+V1Qu
+jVpMUbHnLstaNOqiFVUWt3bOPa+FQiBV3ukiso+vwdHTa+/CZbXoopaksnY6IDSI
+l7mnOZP5K+tUaPKN2b3BW6b0hxh4uE5EKbDVwGHUp7hqbSIsx05nVXF0kfqKIqUG
+KqxXxTHqrO67/eBxA556Ffhqzx2UoeTZrOB19vV1iH9Tl6d/tf+dV0jtDJJYTjw7
+3rd7sX40LQclg9bgIcGN7lCXnbK1/dhul48acNpcdQgXQ2mJ6R6REf6yBhOqzJI+
+a1jQZugHT1Skb73ZVeD64A0VkDqIRG19EOhP3HCCubafmmK/DwsJg1fLeM+D7ybW
+nTUqKk+iKwZm8Q/7riPD3TZD50pJxO8x+tfo3WlXRbVy+ywRwJBwg4yC8R1irHeJ
+fKc1c+8sWX9DOrkZw/dJctF/GK4xdgxvOJoqKNCihLWkJW/wc1Z6ShYnvRBgbybB
+koUEoAiaV+cjFyTeWqUO
+=SziK
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/which/which-2.20-r1.ebuild b/sys-apps/which/which-2.20-r1.ebuild
new file mode 100644
index 000000000000..d12de391f84d
--- /dev/null
+++ b/sys-apps/which/which-2.20-r1.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/which/which-2.20-r1.ebuild,v 1.1 2013/05/23 03:14:46 vapier Exp $
+
+EAPI="4"
+
+inherit flag-o-matic
+
+DESCRIPTION="Prints out location of specified executables that are in your path"
+HOMEPAGE="http://www.xs4all.nl/~carlo17/which/"
+SRC_URI="http://www.xs4all.nl/~carlo17/which/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE=""
+
+src_prepare() {
+	append-lfs-flags
+}
diff --git a/sys-cluster/crmsh/ChangeLog b/sys-cluster/crmsh/ChangeLog
index dbe66ee9209b..f13c1306d028 100644
--- a/sys-cluster/crmsh/ChangeLog
+++ b/sys-cluster/crmsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/crmsh
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.5 2013/05/17 10:13:43 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/ChangeLog,v 1.6 2013/05/23 09:58:33 ultrabug Exp $
+
+*crmsh-1.2.5-r2 (23 May 2013)
+
+  23 May 2013; Ultrabug  -crmsh-1.2.5-r1.ebuild,
+  +crmsh-1.2.5-r2.ebuild:
+  fix #466668 thx to jer
 
 *crmsh-1.2.5-r1 (17 May 2013)
 
diff --git a/sys-cluster/crmsh/Manifest b/sys-cluster/crmsh/Manifest
index fb7660135184..0970b3d84a2d 100644
--- a/sys-cluster/crmsh/Manifest
+++ b/sys-cluster/crmsh/Manifest
@@ -6,13 +6,13 @@ DIST b6bb311c7bd3.tar.bz2 148729 SHA256 2c3e4c1ab9c79f4ef7a8fb2fa8535d566a8ad4b3
 DIST ef3f08547688.tar.bz2 222930 SHA256 628ac6bfe802b81a3223b4f5fad97124fba82fa18d7990a7247fad74ad7234af SHA512 186377e52d5be5b80b96613243af302c8795efbcbc7dc5bfea0b3090157fdce9e2861dbacb1ff0e4519c7301c6c2a5a04a80973476e4bd5079a9f70c2467ac2a WHIRLPOOL 10c00f73af62e5540504f0a96e94557bb3592172dd54a91a97d6d07ecae2e877f2645cb07d3b97314f4d99f1ac80958d0589a59d6dff0655bf00bba379bf6101
 EBUILD crmsh-1.2.1.ebuild 794 SHA256 f390300066612c356f5e7cd7c831e3f867790d9db0dd5f3dfca010fd246f501f SHA512 b850c8ac53ae03fa917b373da597a08b950dde6871a250f57477ac84f9d715d9b9deb96644052330e92f75c77d58d93d0284b141a67f5de4d25a2385393691f9 WHIRLPOOL 90b5b7fd9244d70754ed8c46151efb3fa783608befda05c8c2f82a3ac65bd033e673526449c8049c868a2bc5e8cfe2cf33aacaa35898b1047502cdf46bb628b5
 EBUILD crmsh-1.2.4.ebuild 799 SHA256 0911cd9081609150b70fbb5f6687371d2e7db7ea41727d4d08a7bc0889eb1d2b SHA512 de0d726deff4b856b889c4e7ec6481e4bf360d61dbd9a2855b8cc2b4d08ad3b520c8e9d877aaa0f7d4e27c169ed3d1e5d393e63b88d2dc41e016ad986ea31853 WHIRLPOOL 64ffd62fcfb163e341aef3f406c68324434e9dd33fb314f15d5bbace0e14a69fade5cf30c9c2e72c38296d875239eea113d46b641378b9928a71709778970171
-EBUILD crmsh-1.2.5-r1.ebuild 802 SHA256 80d40a286a1b84d303daee3febaa6e298e565bef0e0bb5d9fc068cee7a945cb9 SHA512 861da16fd08521b040609fc5887f4395b4e0d9452fdee8c42ccfd9623cfd5d25c1053e7d033c7008e73b8202cb20854f34a8919f4a5a229edb13de31571b3495 WHIRLPOOL a664a0244578bf39304361763a43712ff5e63d2d09d76a7987dd6da5303c54401b312fd6953f8f5a1f5b42d8e47bd536d2a7fc568c6e83a3215da4e1be07e113
-MISC ChangeLog 808 SHA256 9e7e534199598dc08dcbf1202709b7a7c140d1b336d2a76eb56a015552ddad43 SHA512 ccfc46873134109c9c163afe9f8dd2afaede0b3c3f4454787c388b121e0b3777e4adbbea8c02c12263755492cad72219e6d37ec478beecd99a8866dcf806e0aa WHIRLPOOL 62a7f0d85754603f292e848c8dff048888c4211b519fb4c123a244a8c5ed4410f6c7dd416500b528475c6238a3e037ffd5b9b050a113ec4379577b88397275a6
+EBUILD crmsh-1.2.5-r2.ebuild 1124 SHA256 8852664172d805d81a7e101bba3fd7dc75d589b338467e14e343098f2f2ca313 SHA512 21e6aa5d93ecbbf3f20f3f13c1a3798a17717e2f12701e7ec8da4e801ed3443ffe9ef501674ead9582e9b9a57b81d7c6527845f541b3abb35190728625491493 WHIRLPOOL 3722d95ca0e4049c1d078dc87da138665c8851fd79ffe1e2183c44af9d9c00fc061dcf4cc0ac456827c11c4aef1247a06d2cc6b8f80b6b59bb1728455322cbf2
+MISC ChangeLog 961 SHA256 b772e2258e6b3236110fdf79cde81c906dc51f376f3d360cb1f3228fddc8e8c9 SHA512 429f499e562daea05f141d19655f1388c2a591fda2568e429a1556a9169dbce7a08ef9de0b317689b5cfa97f8d5b4a0f25177fa812d3bd4b1854acf27866cdfc WHIRLPOOL a68336471e570b0f8ff904d12f608b9e4eec480634efe2f907899d96abc63857afc26d1e824b059582e83748bb1bf21ad6f27782cb96b614bc4a4eb29f07d5cf
 MISC metadata.xml 161 SHA256 fb0c2b5d458c0b9e6cae1b1cf1c80137c4b23c54e657343370b7d293fb29ecce SHA512 f3e07a100754c87015a67a1dd5e71686adbaf25281054a74ec21cb342a2440c010b30eb7d3d813a2504ea2b6d0330ac32511f11b583df1c519d579ad2b6f0c6a WHIRLPOOL c13246d1d1357f83c01bfb11b06c0bfe565c741b971d846363d44579f974fc1cb7b29470627460f6fc4d62eff22056b98cae11bfd497e5a20dfb566abd46c6d3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iF4EAREIAAYFAlGWAt0ACgkQKiQSS7ZY+hPU/gEAwY7RBWABWu4zdGD/B6cfIFQi
-JTTA9C6JhIfInScX1MUA/3OXkIOoXbjVpR85q8DZHCzk98KsU8x1R8mLf+LHHRi4
-=iBs9
+iF4EAREIAAYFAlGd6E8ACgkQKiQSS7ZY+hM4UAEAniocDyS7rvdLvzsvFZy7Gmtu
+wxk1RJmnmoClQj/6Sm8A/j4KbIlMfoD5LwOA2fNa3nioHxxKp8apMt9NY1H9yf8M
+=PSPA
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild b/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild
similarity index 63%
rename from sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild
rename to sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild
index 20b17495b3b0..66210bbce0e1 100644
--- a/sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild
+++ b/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-1.2.5-r1.ebuild,v 1.1 2013/05/17 10:13:44 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/crmsh/crmsh-1.2.5-r2.ebuild,v 1.1 2013/05/23 09:58:33 ultrabug Exp $
 
-EAPI=4
+EAPI=5
+PYTHON_COMPAT="python2_7"
 
-inherit autotools-utils
+inherit autotools-utils python-single-r1
 
 MY_TREE="ef3f08547688"
 
@@ -15,10 +16,11 @@ SRC_URI="http://hg.savannah.gnu.org/hgweb/crmsh/archive/${MY_TREE}.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~hppa ~x86"
-IUSE=""
+IUSE="python"
 
 DEPEND="
 	>=sys-cluster/pacemaker-1.1.8
+	|| ( dev-lang/python:2.7 dev-lang/python:2.6 )
 "
 RDEPEND="${DEPEND}"
 
@@ -27,5 +29,21 @@ S="${WORKDIR}/${PN}-${MY_TREE}"
 src_prepare() {
 	sed -e 's@CRM_CACHE_DIR=${localstatedir}/cache/crm@CRM_CACHE_DIR=${localstatedir}/crmsh@g' \
 		-i configure.ac || die
+	sed -e 's:/usr/bin/python$:/usr/bin/python2.7:g' -i "${S}/crm" || die
 	eautoreconf
 }
+
+src_configure() {
+	configure_crmsh() {
+		PYTHON="/usr/bin/python2.7" econf
+	}
+	configure_crmsh
+}
+
+src_compile() {
+	default
+}
+
+src_install() {
+	default
+}
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 039108c8b88f..2b6c1172cc01 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.300 2013/04/09 11:00:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.301 2013/05/23 14:14:42 axs Exp $
+
+  23 May 2013; Ian Stakenvicius  lvm2-2.02.95-r4.ebuild,
+  lvm2-2.02.97-r1.ebuild, lvm2-2.02.97.ebuild, lvm2-2.02.98.ebuild:
+  require static-libs from virtual/udev so that rdeps of lvm[static-libs] will
+  build, bug 466282
 
   09 Apr 2013; Samuli Suominen  metadata.xml:
   Revert adding proxy-maintainers to metadata.xml since it's only upstream
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 2259415dd3e6..c8cc6c84dc15 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -24,20 +24,16 @@ AUX lvm2-2.02.97-strict-aliasing.patch 3142 SHA256 a4c799777c8e5a83fe1af52ed623b
 DIST LVM2.2.02.95.tgz 1156414 SHA256 0335af36a151dafe5778da55a684546bfb98e7d3193834915b5efe95dbed9125 SHA512 52e3add58d0d3e521688654c6021faee1c0d4298d984c3800c3cae67663fa6ecbf1aa8afd74f5ee6d6c1e626c7635cb8fb1b18be41f3d13e47564b870f3e68fe WHIRLPOOL c94610c5323cad71575bc4fea37afb19daf1dd5feb123ad5494def76ad3cfce6b4afd9ca9658b61f897e3c6401164728bfb65fc1a7c17e4c134bd8f45ba31239
 DIST LVM2.2.02.97.tgz 1193141 SHA256 edda82012e8a9e1f0b00ba5a331468d3e0201992be14c0dbea71bf564a51fc2b SHA512 c209054832f36d7b9cbf833c702410ac95c9de1e213b550c01c42f087fcae346d3c931c409184086bc1fcbcbc154c9a4f8b82b06291cefeb7ae22fe7a4c254a0 WHIRLPOOL d4dafde0ae1607cb231acbf07e8aecd579b9e9042e9356df1074a2683f5f2d1036a3483e1799cf7dd14e64f1f4c5506d3628979fd7128cea70ad45b653403dfa
 DIST LVM2.2.02.98.tgz 1227919 SHA256 71030a58fef7e00d82ca4144334548e46aad24551a3cfbe7c3059b1bd137d864 SHA512 9dd1f98f47af1724a2ff64c6d728a03254c46a499a21d48d305a34ae5728ff7b51ef4d32646a96e424c21a44fc8abc87ab5a25e59fcb75beabbf0d3446e41d7b WHIRLPOOL 5abe78134f81bd19a5bc1a53575f3afe03dd8c71f081fe61a6f6de99804f376413a02fd4d33310d5c7ba05509ad7905f8fe8061c2bf85c15d73bfd02295aef56
-EBUILD lvm2-2.02.95-r4.ebuild 8539 SHA256 a33dbeb82a45a0a6384519ed4917652c9c99957e77ef6bbfcc72ee69afcb6c7e SHA512 ad0a689ec7f3e268ab65dbe65397434ec8dce1fff799fdb6834d7dc44ecada02cef582f82d9550d360517f7a3cbaf5f549c4e72aa0a5f71f85d27047b1deaf48 WHIRLPOOL 73388baac602f2a080da4a6f531b85f1427f2a6f671b5d8b5cc0e81e115288b39f08c5f918a9c00204f63687ae85680f2f01575b8e67e2d7a788c1b4ac6c1ab0
-EBUILD lvm2-2.02.97-r1.ebuild 8824 SHA256 602cee652a9067fd7a5858c0ec16d4a18db3419f2f6dee67df65a2d5028e18f7 SHA512 466511a464e2ddbfa3a1d449511af4c4d637d2f1cc81d5d81efda0f86cce749d5d97fccecd8ce8f3307f6bcfa23cd15193298182f364d11a40fd267d932729ef WHIRLPOOL 620f151f2266da1ef399cdf3845c7d42fd452308c5f2cba78c34e5dcdc622674e261a7fdcfa38f257258538a962f15aa466d5bdc9e61b252118cc969f8cac26e
-EBUILD lvm2-2.02.97.ebuild 8576 SHA256 5ec44ab7a0c249c378f772d6383367747bda458e0d92d2bbf52216f41cf8b3c1 SHA512 1eab6415477fef8ffd803f91704dc91f57a4890b82630bcc4a3da1172126ed8be441e9dd399826cabd9f95b1b554216ca310f7d1d10cc9aefe141a88855486e3 WHIRLPOOL a46b59057bd94f159a8474fb66d8b3d5ef72fa0e06e7469697765cdd6af49c9fd814ed793bece20a75c6118ca4bdc4b7e49ae3d58ab31cdde9463b03c829b9d5
-EBUILD lvm2-2.02.98.ebuild 8835 SHA256 cfafbaa2ec109d5442f00841b4f964bf497ae53389b50548cc41cd3d775e7659 SHA512 420bd4b629213a39a503b745999be227beb6b8b300fe948b88e56f5d281179abc99d43b80624de30badc8e7748fe5ea41a29f0ebe628f111421601534fede05d WHIRLPOOL 66b05bc11e81f88cd5a87e1be8afae4c471c68d44573045ffe8f15c154d3ecd4f395777ac7420fb59fa4ca22fb133ac0e31d16e416355e3b71a555d8ebd61865
-MISC ChangeLog 56699 SHA256 f08174cc624bcfb5128da28e22272ff6fc933e1434ad98c6fdf29c1d1c5a20a4 SHA512 56aac5e9e91c4d9682c66160c94e099c2828a467137ac98207356b8cf6c5a6fa1cebde72fc1044d0860938c527f7fc4a3d9a80041a6cee41243516d5ec5c64df WHIRLPOOL 605ea3ff2e52b0f67137c5dc4c84962bb556b4736df0bdcb55fe97127f2d3bd44198ef5e98901b1447bca168a575d4bdcfa8dfe8bf02f76908df2473fba0fcd2
+EBUILD lvm2-2.02.95-r4.ebuild 8547 SHA256 52f9ad340963bcadd4c13e8259d6f89f300c186e48420d4de233125037ae0d08 SHA512 dea5aec46575c0952b6d7edb5303e7eb6632bf2c22693b2d1eb56c1d8fbcd23bbc5d4371cb7e705c4ca23ea6f853e31a7c106ddc935e846e5b94454052fe7806 WHIRLPOOL 41ebb5249021358dda2f02d4b5b1332dfc1bd27be8ffe6b92e2dbc80b5d66c0af4858e8562eac6058f80c6885e6f8e97ebf452fb3a225c284cb8b2394a4e7e30
+EBUILD lvm2-2.02.97-r1.ebuild 8838 SHA256 b034419f73c183e70745373994660a575f47a3ac677c33a2c496370e3682b0e1 SHA512 6d0daf24f092a1edc6d3c53755270d3e34bf4a36353ce1a7facd344ec76b1a7e36b072ed785790c8796257259700bde1ff2db0f9ab4a40db94a72990384d17ee WHIRLPOOL 491b2ac70a364cf351ab5c2230e59cb1d7a437d5f7a346b1993f1acec8fa54c2edac7616ab4f590bd1a257d89c525da2cda0281347cceb12e4d0fef39c2dc0d6
+EBUILD lvm2-2.02.97.ebuild 8584 SHA256 713bd26b64d4dfda62d28a67f25bbcde876bbff0457cd91d516ebdb5d041ac1b SHA512 c3d381b2f7a75297347255209fd5512987308cb83d2f3cdb78989c461fa419e6540128752cda7872a4c074a819325753cf1d6f5e6de4c5e26bb498bfdfd10e6a WHIRLPOOL 88b9bf3207251b1901f713d61fe2e66051aab381fd97e0a3559dd97feeed04ddcc1825542a9bca17157b78791ffb6113792ce06aedf5c08744b865a17f89c132
+EBUILD lvm2-2.02.98.ebuild 8843 SHA256 2f462885a0ec2b1fc86b5d160eb69433d5c05dd45c5d6aed124f8fff07d74c36 SHA512 7ac0c0b6e1e975b6991863c746f101ad850482549d0df5721d3cc7db1888c27b1864ecbb5c44944ea781b740392ee4f90409ec28e2bb0a72cc88f93402a98e04 WHIRLPOOL f96ca93930c2427e136a15f6a294b3a7e2624800b1cf5abc72fd6e0e3bf883bb1dce018b23210410090f84960c25eb4920f461da7267962fb8e142903599b867
+MISC ChangeLog 56934 SHA256 f1074dd0182ea0448847654ebd8ad3b79c9a89e28dd51272065b7f6903e5a258 SHA512 0b8a9a7d3b92a9376c36259c27c64ebef0e69149fdfb4d275fc4ca932bc8e991dfd5dc6a596ccf6065fb438ba6efe4009d6aa1ef3ac7adc91b8ddc8d6ccbe41c WHIRLPOOL ebd4e63387f5e50b71038e2d22f4a6d03121348576ac35ac80a50cc48129686a650de4e1fb0faba3fa1e6f92fe8a4a9d63e6d566ddca1a5de60b36e9357e0de9
 MISC metadata.xml 750 SHA256 4b4d98a39731983ebd9d926a47283e0b38859eaadd90ea0c56055e788d6d8a85 SHA512 e395da32cc52f94b7a87cbef7ed81d7b6c529a689039e59e0549ef65858ca1e3b226062491391de061ba8d74b75567562a11b46e03cde742a5aae05f05f4998a WHIRLPOOL 12bfd30728a5283258b42aa7d55e5f4f24c281be9def285ede28c4365b830a6caf102a4122dab510debebdce188c486f845551645e66c29ee78482e89efa93e9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCAAGBQJRY/TLAAoJEEdUh39IaPFNXpYH/2foPMFA5o9nLbleIkVl5sdj
-BksZElTfRgaPQhQyXr0RkPeDeshS1+Yi6zT0wiGssakMyjeszvUz7g/l2DZd0jxc
-7i0KjSFWgo1qDX0naFYYeMFGV5Osf9uyX1sq9XcTIETyFi+IQyzlmxkTtwIR0yCE
-pejNQ57X5FIMJYRTKQkIq56eZ+9hZmuJcGuy8bgbK7Ahi7dt99XFDz6H9hFzHp9Q
-CRPDfhboBVvpRlqkNSYUx/Zu+2P9Z0iDKFnDscTBekWDQQclZyly+yvXBmuF/S1i
-BQRfH9tgUgKqcevzsn/yWz43deOBoxUiSOrvls1TJKH4VOzkeCKSI6+Ioot09CM=
-=9FyF
+iF4EAREIAAYFAlGeJF8ACgkQ2ugaI38ACPCKdQEAp/XAOH46WD6EI1isDbGU/lGW
+vlZEas/wEGwnxPY/L3EA/R31W9t/Ji+U3KDw0GPnxx/z95KR7BE9HI1OdS2yxhu1
+=q54c
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild
index 5aeb5824e148..66b23bc05fdc 100644
--- a/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.95-r4.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/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild,v 1.2 2012/11/28 10:55:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.95-r4.ebuild,v 1.3 2013/05/23 14:14:42 axs Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -20,7 +20,7 @@ DEPEND_COMMON="!!sys-fs/device-mapper
 	readline? ( sys-libs/readline )
 	clvm? ( =sys-cluster/libdlm-3*
 			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev )"
+	udev? ( virtual/udev[static-libs?] )"
 
 # /run is now required for locking during early boot. /var cannot be assumed to
 # be available.
diff --git a/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild
index 9106cab88d44..d473ec06b18e 100644
--- a/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild,v 1.13 2013/02/24 17:44:32 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild,v 1.14 2013/05/23 14:14:41 axs Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs autotools linux-info udev
@@ -20,7 +20,7 @@ DEPEND_COMMON="!!sys-fs/device-mapper
 	readline? ( sys-libs/readline )
 	clvm? ( =sys-cluster/libdlm-3*
 			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev )"
+	udev? ( virtual/udev[static-libs?] )"
 
 # /run is now required for locking during early boot. /var cannot be assumed to
 # be available.
diff --git a/sys-fs/lvm2/lvm2-2.02.97.ebuild b/sys-fs/lvm2/lvm2-2.02.97.ebuild
index d8275afca901..d29cb80d0671 100644
--- a/sys-fs/lvm2/lvm2-2.02.97.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.97.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/sys-fs/lvm2/lvm2-2.02.97.ebuild,v 1.2 2012/11/28 10:55:33 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97.ebuild,v 1.3 2013/05/23 14:14:42 axs Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -20,7 +20,7 @@ DEPEND_COMMON="!!sys-fs/device-mapper
 	readline? ( sys-libs/readline )
 	clvm? ( =sys-cluster/libdlm-3*
 			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev )"
+	udev? ( virtual/udev[static-libs?] )"
 
 # /run is now required for locking during early boot. /var cannot be assumed to
 # be available.
diff --git a/sys-fs/lvm2/lvm2-2.02.98.ebuild b/sys-fs/lvm2/lvm2-2.02.98.ebuild
index 1dcc06c37b2a..c062a117d7e5 100644
--- a/sys-fs/lvm2/lvm2-2.02.98.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.98.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/sys-fs/lvm2/lvm2-2.02.98.ebuild,v 1.3 2013/01/18 03:39:06 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.98.ebuild,v 1.4 2013/05/23 14:14:42 axs Exp $
 
 EAPI=5
 inherit eutils multilib toolchain-funcs autotools linux-info udev
@@ -20,7 +20,7 @@ DEPEND_COMMON="!!sys-fs/device-mapper
 	readline? ( sys-libs/readline )
 	clvm? ( =sys-cluster/libdlm-3*
 			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev )"
+	udev? ( virtual/udev[static-libs?] )"
 
 # /run is now required for locking during early boot. /var cannot be assumed to
 # be available.
diff --git a/sys-kernel/pf-sources/ChangeLog b/sys-kernel/pf-sources/ChangeLog
index a31108f0c2bf..3d44370ff8e3 100644
--- a/sys-kernel/pf-sources/ChangeLog
+++ b/sys-kernel/pf-sources/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/pf-sources
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/ChangeLog,v 1.95 2013/05/13 17:52:23 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/ChangeLog,v 1.96 2013/05/23 05:32:02 wired Exp $
+
+*pf-sources-3.9.3 (23 May 2013)
+
+  23 May 2013; Alex Alexander  +pf-sources-3.9.3.ebuild:
+  version bump
 
 *pf-sources-3.9.2 (13 May 2013)
 
diff --git a/sys-kernel/pf-sources/Manifest b/sys-kernel/pf-sources/Manifest
index b126c9691459..a88f81a46f84 100644
--- a/sys-kernel/pf-sources/Manifest
+++ b/sys-kernel/pf-sources/Manifest
@@ -59,6 +59,7 @@ DIST patch-3.8.1-pf.bz2 585454 SHA256 b4a0e24b110ab6d73b020d4399c5afb63c4961624d
 DIST patch-3.8.2-pf.bz2 661597 SHA256 4165acb380ef59b50b455775d23d4212703678d68bddc2794beeaf5f284696e2 SHA512 2f820b0f53059a381c0b4b5e53e4c84a81458540f4fec923a9544803ed6ece8830f0dcac9903b301503a1b289c792d9eaf294c22dcf8854eb63199041ba73c4f WHIRLPOOL 2e802d2118253cbdfa37547ae9b4981389f3fb5ed34234f18bf884fd9e27343bdddfeddb3021bbadf71698213c963f857b1b63c0e08c293669411aa67511d353
 DIST patch-3.9.1-pf.bz2 475583 SHA256 563bb739daafb36f183ce0a58bae46713da7d78a0749d0eb67c1af05ac9c1515 SHA512 930a521832d5cdb73e8424db62946015652741cca08f0ce06f8ed7b1e328ed21fc0e0829546a5803605459130ba0773c503117c1db976730748696246cf5a331 WHIRLPOOL 778656b043cf8211a7fb119c8cf0cc0548bc0d6f0b3e28fb699a4251f1e7f7747ccedcf34e38ffb8a4b98f82a6208c8b06c6bd380aa13a541ac388ab200e8be7
 DIST patch-3.9.2-pf.bz2 530174 SHA256 319764d2c45a5b0e2f2456cd40c97ac6bebe89c127b434ca7d499569bc13a6cb SHA512 3b16ade17a744df25ca93211d362937ebb96c1977c9ffd250f4198adf55d35711084ebac5d95aa9ac2e6f8ddeddfecda07cef4684e0df48124698ed51c665f20 WHIRLPOOL b91792e1bb54df1126dc1e015fe33ad883e81c0d2cdee588e8aa592d7dd666596339bc549a54d8609e0ee5544c665fa6f86d227679d06ca6bc4d8216eb8f4a2d
+DIST patch-3.9.3-pf.bz2 557386 SHA256 514cbd1699e9a3395f527eed66c72dc35df3aa1e62fc27e7840c5de3778fe98e SHA512 deab160b41074f90ac29beada5877325ae891bc8ff4b2684968659c18c1cee659fce17459ed78d8e83557f60c4725fc9ec67837a7d9c954f9d1b7b71469bb0e5 WHIRLPOOL 36f574b1273b1c29bd58f392481a83db5ec3c87f0a1d5812e35f2fb444b9e3b934a6b68e42fee8ab75482b003d5ceae129391c30cc0fc5c5f1acafa97087d1bd
 EBUILD pf-sources-2.6.31_p9.ebuild 1427 SHA256 0ef900a8de2735843590cfd161aa24b04d2ec8ca8be410ddece2090407bc79e3 SHA512 8ac83537c42d9f4393093b1752222e77bdb3aa7418bf69df89ad440ff0f531bffaf5c4601109725c7219e0c3adde3732cc27caad7f63a5250e84875bce5ddfda WHIRLPOOL 3770f38ad9623ac1ea0025fc65e136c330a1b66b35b7ea59c07f656e1015b6d191e4eea7f1276dd6ad5d2cb58862f093c23a5c39e851c8e35a982e07d01b851f
 EBUILD pf-sources-2.6.32_p16.ebuild 1428 SHA256 a7c36b5cecb66b487c3bed7e1690d273282aaee33feefb172799e0ec7738d7af SHA512 1c5e76f45bfbdb0352db6caf1d07a7b0befba8f9eb0aaddf217e37484a1772f8f5dc3305c29a15f0d5c4fa81814128554a481c75ad2b0bf8ae58b46b7f5720bf WHIRLPOOL 9c2acd4f7e4b1530dc18375c1f2e13bf3bed833c78ebf82a81dffabfded4d3c00996a968d75fca1c28f652e299025a57d7bab9fe947a8d4753c458afd5f7aee9
 EBUILD pf-sources-2.6.33_p4.ebuild 1427 SHA256 4b04d2c8e5b54dc2d0a1517d9619328ebc200aa90ba2181b539dafe3afce6a6b SHA512 5bcc52f44b572591073646647410290122f1992a0bcf143c44264af4be8d40d1d6f255937e7e2a85304d770e8c4b00edd1693244b87afda4b0d3e3b664b7ce23 WHIRLPOOL b41f694d5298fd913826f5219963c82835dfd2173155cc29e595a0fcee80237a727f889058a76093448d172819081eaa90f13786f03a1c48bc6ff0a8ff09d9cd
@@ -80,22 +81,23 @@ EBUILD pf-sources-3.8.1.ebuild 2128 SHA256 14df22fbb50c69ed0adc30e209356fbc4edf8
 EBUILD pf-sources-3.8.2.ebuild 2128 SHA256 1eeeb49dc39c17620b12c06619492b414cba8503d44e90254cd4dd77b73639fd SHA512 ea7385b604efa7b9904356b0e2622caab2db0e44ec3b1656d9d94342b95433bb7ba63ebf283b3c79ec5e2aa9479ce8a407dfeba826ae6d72404053d487bccd21 WHIRLPOOL 6317594e61c1e73d7897d6ace16330f0694a833f4f171fb2186d2a845591892dacecbbcf11ffc421b81e31d5fd64df4a42c60f9fcb1b00b880006c5cb79d09a6
 EBUILD pf-sources-3.9.1.ebuild 2125 SHA256 89124fb9d626c87f7507fd1365b0df2645df278222e47b52c0eade26e22b297a SHA512 147a2a033f789982eea914aa51fbb68803fec436d900b512f81561fe8a9579c992b554298e0ce3fa305147a90c51869df4ee33be7b3f03085bfc048ea72231a0 WHIRLPOOL ad475b5a9f6ef89c65aafd06d563a9913b9e0cb90160fbdee0aeb7d8b03535ace47ae7615267b02461b95ddfb8006e2d1737d324273812bba854c555183ad6f5
 EBUILD pf-sources-3.9.2.ebuild 2125 SHA256 6d82428ae179ba93e7c0372c684aca82254427dc4b54abbb0a5abfcb6b50705c SHA512 071d684846fdd2aad67c1bee29127b47f67fca1bea4b366a9d20f09ee3bbf87e825b618d05de9c4079ed11a11ec70acfff4055a0d9904a688550f9e6b1be8f5c WHIRLPOOL 19bca5dc213edf905258650270b0e5c7192bfa74ecff74a3f5a329f659f290ee32db9abc3723610f03b3ef8292c7e65b4047793437116b131eeecfe8e2f9f6c5
-MISC ChangeLog 17161 SHA256 8ed9fa1591717a37b0b5364e837d2f19748d00539db780aaa5e8f9e7d6e4b3fa SHA512 acaeb8df8a924baff5d60fcfe18a5cbbf672651b46a4c889f9279453bdce45002e553c1da62119c1f42746c95a14c788005dc033145d02789ec644c8c3ca27f9 WHIRLPOOL 208a7a0ff6d7f43a2fe564d5da08bf4cafc0e498c9c7652fecbb822f8e7fea10726608d6b8b5e79a66441075956f421d890b969fd71824dffaee868bea2b1ee9
+EBUILD pf-sources-3.9.3.ebuild 2125 SHA256 30b13564016879fafd21cbbd4c9a307bddd6bd53a2258238af2f4dd12c00bf3e SHA512 ed5a6c4673ae10fbc0d0ed422b3adddf1a31cf74df2b41200d94f2542523618a0aeaefda5263f4ef1edf1abb684732fe2377079c221c6f1ced81b439f1457b7b WHIRLPOOL 087bad4cd7c11f4aab7a259e6de4f6b18c18fa16bec85e026b52003a73774ffafd3e1ea34348be4c1bb1de3346e7ffd567bfdb0f151ab8fb5824984e1881907f
+MISC ChangeLog 17285 SHA256 b5db1f37c9add942360cd4f747f0fc629e0b67e3e9a2193820c90a24733725d4 SHA512 0a3d597cf197e01b3a1cb8d4b2452c3aafe2a35305fd36283316c9fbf1e5523cce4b1b53c3bd93dd4fe0c0904f61e9b5d1196e6e75604dfbe82def87d7674e1c WHIRLPOOL 09008fb3250a1d6abed52139b600333f7817ce2f505240b9e53fb883bb9aa39603faa687980f7fedc59bdf13467cda63732b12ee9fc5e795beb46af0a3aa84ab
 MISC metadata.xml 617 SHA256 6d4917f8f08197d2b4459d277d90bd89ee7b493610b420cdcf14ba4126af4b55 SHA512 ad0295ad2cd6d4f32355be31ebbc88c05218e3a202cfc40c57a57192f7a88a92af991450373e859f295e0cca55f6fdafd38eef6ccd4f261e305a034e726b5b73 WHIRLPOOL 6189c786dec19cbad88c9ab0ccb29453224d973faefabb0e97c1797bb5151cecc018771c14789f7569265e8b4a6e1feab02257df6bff19436deaa030d4bcd2a0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRkSh4AAoJEDZF8K7rm0r6fMQP/REZzIuW300ayeW/i9dT9RJe
-U2pXB/rdjX795VY1ivo0PHKwDXqNRiXL7wao+5ZnZa9/G9AwMUbiWOPpkqGkDGra
-vsY6SUJ+gGtEw8r5TTHoFlpkY0R/UGbc88KndWXRztrjiBykUWncMd2lFEoLr7qS
-jzUd0aID9859Gj4vmBbwk9DofBSDYUXqge2O4wmKC6qVCHsh+0N+liXMNUcLr0j5
-haId6ht5OZl16W3+SVe//q2+0Cx+Eo6xk8oe1cA2Q0RECXD2/P/IWU5Lx3fwQsg3
-CxiHobKFOAKO1w+ZEDAkIxAuEJUmaWRbI6Z/FunC5uRShdhuNUqtsy+GUB3HdRkP
-I6ePIzdFF9xZ6opIzbgYY/6TdmC/53XALsYXGI9biXFnftQighk6A9qku1mY/S2Y
-3jtMMFRL8xWjhgon5wdq606/TK4yZnKZUyqGIltKyJAQE/6gqFaxwWL2Md5ZebmG
-8c5Ukfn0ciX8vmWSYVFfgU1Fywg/jme2izpHoMzW39RJ1GTXD10wK1niG4L+RE7B
-ZgKdH/eQRDQgoTYzAtaJfRPYzT5vaNbW2vB2fmMykGL7jyw+uu3dfrqBXhMf/phL
-q39Oa0BX1QynlMb6pZry1NDEVwZuuRjg/+PizZRV8uZHOOaQg65MHXJaTrZZIJVU
-/0BLghWfu4/is1C2MyjL
-=wGf2
+iQIcBAEBCAAGBQJRnanbAAoJEDZF8K7rm0r63BoP/24rEtnQuz4JyycGvGC+gBXi
+FF9j43c0RlhY9yoTVOhIMJoh6rzsjSUhm+BpwKnTWr38AUQwLFnps7Kr9huHb+Pd
+ThckGIwLoS4MHEIALnPHHRaqpjlwaVKRtUKvHOdAnS8iuGQJbyH7R5wqpOMeNS8r
+502VzOGvNc0Px1wONcsEdw/ak09jmN1YR6CCqfforQF9HOwRO2EyN7JWmW/mj9Wt
+S6e97TwLaNDoLY2vqBMBGDX5vnr8US3kGMuVkOG+GnMQFz9addHRkV2yScJgJv2J
+veM5ldP/IqkQoirnTgGdf8MH7sz18XhgjPa4xvbdRq7ipfA4OCn+kkqonqdTEBWr
++6+toNHwzC+3v7T6zOLNNqlW1hW2dcYhyxfeOlOz/OlHvwvHvz6JNA3UiuXclC3p
+o11jORXaYpmaDc/CyM456vPwEyvVA/bw2IWgC3BDul0Fupz2J6ctBQFKo/gIPlgw
+mhirbuFFJ+wp8ZICyA1Z/+uxbKrARpx/YAUjX57ecRvcjs1CPx4Uonngn6F5tOdp
+NUHWJcZCpFRv3N5wyokQ3/5MDz9Y2+T97iaE4vNuej6JQuM5JGe4RY2QrOnxxO3k
+dyLU1b4saMaNrA8gzY+c8vOMQ0ptqVW9mvY9+sEGpnWkVsKWgwMYL08cS/XFHNxh
+M8epuE9nmo9wu8qlOKza
+=uWTH
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/pf-sources/pf-sources-3.9.3.ebuild b/sys-kernel/pf-sources/pf-sources-3.9.3.ebuild
new file mode 100644
index 000000000000..99176735c5a5
--- /dev/null
+++ b/sys-kernel/pf-sources/pf-sources-3.9.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/pf-sources/pf-sources-3.9.3.ebuild,v 1.1 2013/05/23 05:32:02 wired Exp $
+
+EAPI="5"
+inherit readme.gentoo versionator
+
+COMPRESSTYPE=".bz2"
+K_USEPV="yes"
+UNIPATCH_STRICTORDER="yes"
+K_SECURITY_UNSUPPORTED="1"
+
+CKV="$(get_version_component_range 1-2)"
+ETYPE="sources"
+inherit kernel-2
+detect_version
+K_NOSETEXTRAVERSION="don't_set_it"
+
+DESCRIPTION="Linux kernel fork with new features, including the -ck patchset (BFS), BFQ, TuxOnIce and UKSM"
+HOMEPAGE="http://pf.natalenko.name/"
+
+PF_FILE="patch-${PV}-pf${COMPRESSTYPE}"
+PF_URI="http://pf.natalenko.name/sources/$(get_version_component_range 1-2)/${PF_FILE}"
+EXPERIMENTAL_PATCHES=(
+	# http://ck-hack.blogspot.com/2010/11/create-task-groups-by-tty-comment.html
+	# http://ck.kolivas.org/patches/bfs/bfs357-penalise_fork_depth_account_threads.patch
+)
+EXPERIMENTAL_URI="
+	experimental? (
+		${EXPERIMENTAL_PATCHES[@]}
+	)
+"
+SRC_URI="${KERNEL_URI} ${PF_URI}" # \${EXPERIMENTAL_URI}
+
+KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~x86"
+IUSE="" # experimental
+
+KV_FULL="${PVR}-pf"
+S="${WORKDIR}"/linux-"${KV_FULL}"
+
+DISABLE_AUTOFORMATTING="yes"
+DOC_CONTENTS="
+${P} has the following optional runtime dependencies:
+- sys-apps/tuxonice-userui: provides minimal userspace progress
+information related to suspending and resuming process.
+- sys-power/hibernate-script or sys-power/pm-utils: runtime utilities
+for hibernating and suspending your computer."
+
+pkg_setup(){
+	ewarn
+	ewarn "${PN} is *not* supported by the Gentoo Kernel Project in any way."
+	ewarn "If you need support, please contact the pf developers directly."
+	ewarn "Do *not* open bugs in Gentoo's bugzilla unless you have issues with"
+	ewarn "the ebuilds. Thank you."
+	ewarn
+	kernel-2_pkg_setup
+}
+
+src_prepare(){
+	epatch "${DISTDIR}"/"${PF_FILE}"
+}
+
+src_install() {
+	kernel-2_src_install
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	readme.gentoo_print_elog
+}
+
+K_EXTRAEINFO="For more info on pf-sources and details on how to report problems,
+see: ${HOMEPAGE}."
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e1e3420a0260..ecd20f452fa1 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.883 2013/05/21 21:40:13 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.884 2013/05/22 17:26:59 phajdan.jr Exp $
+
+  22 May 2013; Pawel Hajdan jr 
+  chromium-27.0.1453.93.ebuild:
+  Prepare for security stabilization (bug #470920): only require
+  speech-dispatcher-0.7; also note bug #470934 and bug #463550 .
 
 *chromium-28.0.1500.20 (21 May 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 50cc11c05e09..d8b8b4be53cd 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -34,17 +34,17 @@ DIST chromium-28.0.1500.20-testdata.tar.xz 141046188 SHA256 5184434c575858c586b0
 EBUILD chromium-26.0.1410.43.ebuild 16049 SHA256 f49f9ed4a82964f84e51f5ce9832e2cdb492a56db24203b466f0303a6df1cbc7 SHA512 e4dbfa9a35657136a9128c9895d37278d801430ee7f2548e2b95792c5485b76a25a229fe2351e01f35378bad1b13bdcb037da18d2349f10bfd2b249fc2b545e4 WHIRLPOOL 7fc8f4fc871c60d02e1b7dba8ca4344a07c5c661e029217c0c2dae9ef4764588e5aa98ff22946d94eeef9fbb53cbf6fac0363b8b268e6e84df151ee8e8ab94ce
 EBUILD chromium-26.0.1410.63.ebuild 16166 SHA256 a01a9e49f044e3dd7194eee0127b267b72581771271bf86f19d8236523069b67 SHA512 415c50c72c5270dc4e80486b4dd328995269e3e48dbb5e74603aed5f2a9cddcf341b52d5fa2a8825c20691146617395c0900c886731f9927683a5dd6763d0a85 WHIRLPOOL 3fa509516c609ea34da827491fa6dfbcd10f7dbdca68fc58331403bf2bc9f80f36db8ec13f6e74a5e7ddc32ee5c795c9a0b31a1760922de08404a95410155dcc
 EBUILD chromium-27.0.1453.81.ebuild 17110 SHA256 cb49bf0075c5c50fc40f7cb82802595b04b12ac59c14a4206ee5faecd3cfd349 SHA512 36b74e47be9436ff7c6eeb7a1c736fbabc1b93ea8c6e2fef88d4721b9acd949a69c2bb40d2ded9c70c0cffd1eea33bc7b1db86c673ea4c42fde9f084b06a228d WHIRLPOOL 41192eaccb1fd81d662be6f441031acbbe1bfab2a84d67257ebc9d0aaab4c64248c8c8f0fea98f4fd8094222b6b24b4ceb9c212d5645f355aefd6060051ea7c1
-EBUILD chromium-27.0.1453.93.ebuild 17110 SHA256 b2afd42c46f9ff868d7cf939b255ef6810d07a192f53771471c8868d36e6611e SHA512 351b7f78b8bd1bde6b7f8bfb5efeb51c3a33533f8a1dc7ab27132873596cacf6fce3d089d9d979598058049fa468ac29972901156711f91246651d0a7b1671f3 WHIRLPOOL c006d2b30b0d9fdb824c407fb22408a629e0218b13e6aa02a54c618aa723c5cef0c25891997ff45b23ae98c0fbebf3e13f865441c07c1b6c379a439c79fe1ee8
+EBUILD chromium-27.0.1453.93.ebuild 16998 SHA256 77ead6df685026d07d604bb9a35c8070ff59eefe8461f532389be4d30f905ce9 SHA512 382fea619216e66dd600979a28a76266e49fe97bc4b7e4ef5de5fa75f294ae9f05b3d464db22449411b61cf3a2d64f7f9a324d621cca692ea4857ce392c142e3 WHIRLPOOL 7e702b83a99965cb48ba9c0d106f28027d8b5f1753fe327adb7bb0492df3faffe85b96abea078f064b3cda370bf3cca3e87c3875236cd8391d2c045b684cb8a4
 EBUILD chromium-28.0.1500.11.ebuild 16870 SHA256 ff64c7feb9a294ca5e292ec737cd09ff316914a20950fea466aa8f3ca02f489d SHA512 b00262e3e6dba49c0a5156a788c55f85aa15b713caa3db5c66d4d221dbfb07fe342d5e90a975af20bb40ec6895e49e79d96731b54e6a54c0562407d81365f325 WHIRLPOOL 19933ac0a645ebaff94c4200222c647ec2cabec68d6bff837557aeb51be8cae009d4e6915240f653c2780c2d60f5975940cea2cdcd753c07f077fd64a28f84cc
 EBUILD chromium-28.0.1500.20.ebuild 16870 SHA256 297e07edef53c1fd97da746a1a276ac32f37d5c10ba75fc241751503b33ca3cf SHA512 fb9b606f26562fe619f280995b3dd33f0a6b2a9fd1b188ff2dd6d0ad9ee29a5673ae827454a5c7026a5f0acd7339981a6e0a00e556e3ac02684c7ef19cf214d3 WHIRLPOOL 09e6b38116496765080484e05a1dd0625fb010c8223217061176cf1eab85383f3dabcbd4671e98249af19bdc000671bf014a2a20b850c54f95fb0e0e687bffc8
 EBUILD chromium-9999-r1.ebuild 18634 SHA256 6c70673d9ac374e288ed7525dbee8e277847f7c4027307c78fd3b970f71fb657 SHA512 0a46f65d60f5ceb38216314f2854107542641d26b55df38aea57dd6ce7009355431d877fb16b743072dcdec6017b6b5221d7e73c47eceebc20e3110c9ee4f7de WHIRLPOOL 000589ec5fe1d5dbfce233b310d15c59ec4d4597b0f8a02b771aab87a6d13358635a5006a9c33fcefc143dfda4fa8433878458cf1334c0c4d164191b3fff2933
-MISC ChangeLog 69627 SHA256 7d6c17801164042e2daa624677041ca75462603fd4015ac9ccfef61f9ff983a5 SHA512 b4e2e21c451695380e41798eb1d31c8dac14c45a8a856f4dccdf63100b128b455630ee2b4821e5e83b1efe935db02238a0b033b3e63eceb887ade4bc24e91d13 WHIRLPOOL 40d942cf8522536a714db55a6bc1ae97c259fd621b6f283cd4c769a99b20c917f197713ec7b6868ea66e99ed6131531418eff583770f64c63ee6b106bc554df7
+MISC ChangeLog 69845 SHA256 ac4cf2448964fa20bd773709a2c441915085beb1e07f2b65a4268332f81ab686 SHA512 5bc28ec523e7417e1fb3543d0e5b205d67978f8189ec4bef33890c0e1ba28f08a4ff47150172ce3c130ec9aa185e02928d7a47315a1b39f8a631bc10ba563f44 WHIRLPOOL 7ed905a9f7adc7c907708e479ca552faa6bf543433c42412e94a1057c237aa7a6019d739bf37455d938dcd1a7a4295bac53be8be90b44b75ce6d9f966dfe9c95
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGb6cIACgkQuUQtlDBCeQL57gCdFmv17SBvjtfQY/ec/r6b3ZA1
-iyIAmgOlOwJ6x8QDo80N0hZRzwyGJQcG
-=p0zK
+iEYEAREIAAYFAlGc/+4ACgkQuUQtlDBCeQKzkwCeLJ0shQ+uL+QExYJ+24byHY+F
+Q2gAn0BTWj2gZRZJKki5Y8yYbT8rLJae
+=HBMw
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/chromium-27.0.1453.93.ebuild b/www-client/chromium/chromium-27.0.1453.93.ebuild
index c84ac1b6c697..e1e9e601a4df 100644
--- a/www-client/chromium/chromium-27.0.1453.93.ebuild
+++ b/www-client/chromium/chromium-27.0.1453.93.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/www-client/chromium/chromium-27.0.1453.93.ebuild,v 1.1 2013/05/21 01:18:51 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-27.0.1453.93.ebuild,v 1.2 2013/05/22 17:26:59 phajdan.jr Exp $
 
 EAPI="5"
 PYTHON_COMPAT=( python{2_6,2_7} )
@@ -25,7 +25,7 @@ IUSE="bindist cups gnome gnome-keyring gps kerberos pulseaudio selinux +system-f
 # Native Client binaries are compiled with different set of flags, bug #452066.
 QA_FLAGS_IGNORED=".*\.nexe"
 
-RDEPEND=">=app-accessibility/speech-dispatcher-0.8:=
+RDEPEND="=app-accessibility/speech-dispatcher-0.7*:=
 	app-arch/bzip2:=
 	system-sqlite? ( dev-db/sqlite:3 )
 	cups? (
@@ -135,9 +135,6 @@ src_prepare() {
 	# Fix build without pnacl, to be upstreamed.
 	epatch "${FILESDIR}/${PN}-pnacl-r0.patch"
 
-	# Fix build with speech-dispatcher-0.8, bug #463550 .
-	epatch "${FILESDIR}/${PN}-speech-dispatcher-0.8-r0.patch"
-
 	# Fix build with system v8.
 	epatch "${FILESDIR}/${PN}-system-v8-r0.patch"
 
diff --git a/x11-drivers/nvidia-drivers/ChangeLog b/x11-drivers/nvidia-drivers/ChangeLog
index 2faf0ba5c607..9ae91eccaf13 100644
--- a/x11-drivers/nvidia-drivers/ChangeLog
+++ b/x11-drivers/nvidia-drivers/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for x11-drivers/nvidia-drivers
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.459 2013/05/13 14:49:55 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/ChangeLog,v 1.460 2013/05/23 15:04:55 jer Exp $
+
+*nvidia-drivers-319.23 (23 May 2013)
+
+  23 May 2013; Jeroen Roovers  +nvidia-drivers-319.23.ebuild:
+  Version bump.
 
   13 May 2013; Jeroen Roovers 
   -nvidia-drivers-173.14.36.ebuild, nvidia-drivers-173.14.37.ebuild:
diff --git a/x11-drivers/nvidia-drivers/Manifest b/x11-drivers/nvidia-drivers/Manifest
index 4cd9e3f89ba6..0eab0d4902b9 100644
--- a/x11-drivers/nvidia-drivers/Manifest
+++ b/x11-drivers/nvidia-drivers/Manifest
@@ -15,21 +15,24 @@ AUX nvidia.udev-rule 462 SHA256 37b152a5055a16d1947171567178e2841679ddf03dba9d48
 DIST NVIDIA-FreeBSD-x86-173.14.37.tar.gz 19603409 SHA256 568109656f95791448306d55e7732ca5f963c8ecd06cb0bf8c41c8b75d8eaa44 SHA512 86bd796210b18d634d6733f1d4fd3fefa91cffdd2be5ad0c9712f04c8740b8f9446e9ef04daf44d7cc8d5a491c1d34060837a8bdff5e7be2c390897049ee601b WHIRLPOOL 64c4ebe9e0ab8abb8c136a8aa9a0c7546958e54cdb229dca96a469356d56e1e74dcb9e5913472a8306b0cd17454bb8da5d688453b318e328419c529e6f820b26
 DIST NVIDIA-FreeBSD-x86-304.88.tar.gz 33651825 SHA256 739325b26a93d934d015159c420ef1875a24ccd62a5bb482e688cf918d4fa33d SHA512 6dab929d2d2bacfc3a96ab24ff02996938613851e2b3c050ed3a1d0cca3751c574f12508e21119f2b43ff0421c3f88bf4edd51a37f3374c72c6337bcb8d6bcdb WHIRLPOOL b9be513a8dd8ce4cd6eeb23a24e725c751bb2cce0745477df2b4b84d7d03ad557d0b16bcdfb8d642168de09d59b057cb2955fca11f50b281ebad92f30a7dc4e1
 DIST NVIDIA-FreeBSD-x86-310.44.tar.gz 32589992 SHA256 3f425b5f86d3cd764188e6e3f8c63cb4245734e11ba3b3d3ecc66786bbc279e6 SHA512 054cd04a340f773a1e6c670fee1468bd78c8e919d3d54642550490970db17e3286a899e0db4aacfb3512dc919056d0c47c81b84050e5f40821b7e335397d5b9f WHIRLPOOL 35601ba6cbb53d0ca48da33b7aefc21f0acf05a0d17b87001515e757f2be319ec04af20504f57bbcfe49e56918bfb6b9a94338d9da8c6eb399279254a68471c8
-DIST NVIDIA-FreeBSD-x86-310.51.tar.gz 32607994 SHA256 7b932fc1839700a2f21685f7d5e92cd1670835a95df687c4aa9ae8abd5510dd1 SHA512 ef5f270927781a68302a1138c8a4fac827dab4c0a906ca4e852977fe3233bc5a7512d2ac2b1b2536b26430fd6025a264f094e35c41158e87a97402c83015b474 WHIRLPOOL 0d017a82c4dc58c64b5966306ec1c4328c9aef794f0651f6d511c8bcd9820f28aaf65efce337b845985e6898c5c86b75016674ff952c6eadff9a3f87c49153a9
+DIST NVIDIA-FreeBSD-x86-310.51.tar.gz 19512752 SHA256 95772b0b31a438f5f58e15c09d752a0dd7c3e98afda60e7b8239ebd2557d43a0 SHA512 9060d16e38c3edd080328dadc03df0601be76a79fa5610024077705c2ff177e6c7dc4e9a2c5fad6b58ef77b2c34477408a377a4dd12fe7ed47fcd48199bd572f WHIRLPOOL 151d874e61880a2eee146ca51d20a66c2f563b6c2e04c3070a1e6309c2a572dafdb18a6c8e385a2f767d652b2a236e5bd3a355e9abcf23d750fff5d2a9371817
 DIST NVIDIA-FreeBSD-x86-313.30.tar.gz 32591892 SHA256 1e02831fbaddf2f27808ea26352d835417f59bcf54ddb3e9c0f1d7b76dcb4666 SHA512 68cf61fabf707dfa1225011cab3749959ab29f09f611347eb9f9bd55065012d04382998e67091c4d3c1af9be21be6381aef9b6414448ee15f9a36d44448f5bf8 WHIRLPOOL 71ded70f45e880db2c2850c596cebafd004adf89f7131adaf324d1d38abbb5457a700bfa9e671bfa144515556f011df8a37fdf22b78b879f39007be6487f060a
 DIST NVIDIA-FreeBSD-x86-319.17.tar.gz 34029600 SHA256 c5e2ab023a8a32a7ca174e54afdfa173a55668e0638a843d77c7dbc19174ae99 SHA512 609dce130e8746382562c5ea6c99f054e6b1e2eb9c121bae4bffbfc009b50342a4b2bf65ce0299282dba023a4df9f35bb221dd18216bba649b36a8b3956c701e WHIRLPOOL 4bc33476e493379beb84331bf97c1143e5c17b0ce0bfff2b43ca7c0753cdc943e4588c4271f0865b4f39ad44466db0a67d0b159bc9f23e279da4a7d43555e9ae
+DIST NVIDIA-FreeBSD-x86-319.23.tar.gz 34030220 SHA256 e5ce02bfb464de70e93ff3b5c86cfcf5e727a57c23c393342e4e005c76dbe6a4 SHA512 a8d4c4c67dd40534a95cf921ab9d3389e4f0bd1032195aa94957ade8d558352be4f79389bc45d9f3ae9bc19a1d869216246ceb082450b95efec32ec2f7d90328 WHIRLPOOL 10aeccf062819fb7afea1c40e826bc959d05257410128b2a75b3d89c2039dde219327a95f412dc7358850b57eb77c86e40af6b224a822471b341f2ab51a532a0
 DIST NVIDIA-FreeBSD-x86-96.43.23.tar.gz 15463464 SHA256 18d855db8381eda1a6cf548c9e5095fc5bb8694bf1d6e24fc1072fba4e54cd78 SHA512 42d7b1b76cdb3b23680363e565614a22112162a5dd3639cb804fe670c0c3f3f23595bbefa3f78afdc6a8ca848446dee853c7a355f2c96a0d01b354753ba2785c WHIRLPOOL f8e59ce521990cd9edee441e73f973f074db492952807a0931e362102874cddbb47604ff5c5eb20a0cbde27f9b6d4e440dd12cc2e5a20c9cb65bf3c0b3e62511
 DIST NVIDIA-FreeBSD-x86_64-304.88.tar.gz 34597351 SHA256 be0e20a543fa14a8f91481dd64b080093b19edf951bf631c62365a64dadb1934 SHA512 143af863aef72962d83c6f77160512d0860a62964e92043400674b0be95735ae6f2dbdd25c42fa96b4511cece9c73b7072f829a88d46ab6b79aa750b65e64748 WHIRLPOOL 74b5014736065e178b261716e81f367395252efb3aa3b84faab6b6d26f561caa129e1d9bc0e02ce98f83dcaa3603fddd155de4b50e760bf2ea8df4c176b21e76
 DIST NVIDIA-FreeBSD-x86_64-310.44.tar.gz 33558256 SHA256 bd4f780907e3208b233e0f911e9ee2a6cfe163efd33bc29c06ecc249041c961b SHA512 68b0e9222ecb349bdf7cea155756ce3fbb35be12ab9f365bda547c09e37f35b42b8625d32ab3375a0d6c0426036aa324275cb87f7fa63bde9ef372e876d736ab WHIRLPOOL 83696b09a40dfaa6c50a1a2d826df80c0feb03b1011ac24c1b3771ff277f8156047f2bfb6528bb01b76dcbc95aaefd167fe7198c15a5fd6b3118e2d4fb320c3b
 DIST NVIDIA-FreeBSD-x86_64-310.51.tar.gz 33574579 SHA256 9b3309488dae7097171828364b4aa4e9714afc4c5dabc0f2e95ad2fa42534d04 SHA512 0f26df1dccf5c8fbe169479ad09f6200c29ad4f1bdc3d314ac67b88186692924c193b6c34a8ce28d1ce28394909fe39e1e047c3616091fbb768cb7ca60be5669 WHIRLPOOL d08e206c376c01d0c28cb1100fc1106d44cc007985a1030fef666f440e5d6bdaf7d352cb7a8b72b9195c3acc8fe4a7adce25f876f24ceb12adfc27994413e2ea
 DIST NVIDIA-FreeBSD-x86_64-313.30.tar.gz 33557658 SHA256 192ad1bb8a0cd649e12bcccf97c5f4d2002d6695126fea81586991d9e95248d3 SHA512 79b3b47bdcbc99f724f8c424733c11f1b2653103bbe0ba9849587628611d9da08ea434c786cc7d3d891bde3dfe4068298a7377ce5b1a3484fb64ef4d28c896da WHIRLPOOL 7307d6adb04b47b8403134e7394bf9af4f90839d1fb62aa3b7b7c6d8e367392829fb249dc8d444e66158fa5b5b15cf5b6c16e1f5659a22a15c17f55eda026660
 DIST NVIDIA-FreeBSD-x86_64-319.17.tar.gz 34424474 SHA256 fc618f46a532cb387b000e74573a5235a2fdc05f01917fb033690eda0b6ac61b SHA512 20190888f5c1da8805e4a11b5dd4d85835404ef4e7ea7f07bc6201b7e72379b67dac60e73ceedfd5ddc57fb3a12cf38653d58df156a90fc6dc5484991bbf5e3f WHIRLPOOL 1be6931a1b99fc0e1eae21c85c418f0c08b675baa81a86c7dd8a19e5c37292111e2ce83cc7504fe781770ec08723f84cf1b35783f33316ded98e588a93b467a0
+DIST NVIDIA-FreeBSD-x86_64-319.23.tar.gz 34422044 SHA256 1a946f01ac044d18ee945836009088726ff313f85e8068fe71d8317ea1b51c92 SHA512 54b2575bf6a6ebde9fb5c8af97c56060a12b09707d911ea5ada008d15b526b7198b7fe15e74c8e3bbc0b1263d7c18430e92ec64b420d5df5062c5c93870b3a2b WHIRLPOOL 66c4ec3350dcd726db208d8435a67e51f9997c277c78643812897c2ff5ba2ab74bf9c7bc6e05d2f596169248b8be464a8d244f177bcfafecc77629f7fc9fd6a0
 DIST NVIDIA-Linux-x86-173.14.37-pkg0.run 14765478 SHA256 0c16885a1d8c370f85be73fe2ebb1e74c0e23932b349ca381b02c2b67ab9371a SHA512 0329bb7a971a93982be2626661d6f3faeede19ce6fef603afc85cce74cea1d5ffd7c93091c4e82de60a5a54d869b47cb2014677ae64081d234d7eb0745e01937 WHIRLPOOL dd558a6ef3a08d7cd1471c25b2d2b533f0a4631e58705d01eedf13b66a134797a07d8e7377313b9cdd55edcf1344c58e6f225998cb593f8eb6e26846a62dfb5d
 DIST NVIDIA-Linux-x86-304.88.run 39682604 SHA256 71e10294f073e31a387da4282b95cdde5fbfc996cb1c564f290eb0df1289b7cb SHA512 ba6f0236aead2f5161c94c7eaffb2497815ba1a7cbf872ae37d620d66533d4847acb6dfcc230e2b751aa9717ae552940ed6d3da1a9209aa54f6a810e3f551e49 WHIRLPOOL 9c2e0438630e86ca8c7aa2f26928113e5f15dcf808be8a4c2e937fd04b8d1aa7304bda714580834cc5ef4dc57304f41be62b55ee75545b9cfca3533b6db737e6
 DIST NVIDIA-Linux-x86-310.44.run 38875248 SHA256 badc82a6a2edb52caea4cf4c3d8acce35cdd05b8594e2d5b7d97740f7859ae00 SHA512 541cfe5b4a5388a258ebf06c9ef950df3ada0560150758187b21d70087531cfc0e0481b6709d8e00789d14dbcac8b9b6427dfa10ff85978ffe8886081970f268 WHIRLPOOL c622239b2830dcad8b12f672eb08ed443fc6f9f8f09b42291914f461ae5c408dbb7cf768408d8664f4865795773cebae717e620b61239f34149f79283acc901f
 DIST NVIDIA-Linux-x86-310.51.run 38891291 SHA256 f2162d903bf0873b9d4e1ad6dc464a10ee9f28b508a10525879c51ed5f47c6ca SHA512 41e14da121140be7c068703e9adbb4208cd3d9b786167523b1fc04420b7f830d89b1bcaa4a1cfa991bd59f48e1d74bb50f16493256e5fab355047985d180d26a WHIRLPOOL e548ac02b98e13aa72d9291ab668f60ba0491f9b8b91e7dda129f1e2968e105945fa41da388af189e3ceec2d699c2bc591e3dfac4759c62726a139087389f956
 DIST NVIDIA-Linux-x86-313.30.run 38845860 SHA256 0a0f10979b1bca8e4a244e204b58aeb9a580924a9dd7b11b21d15abfe1ad49ad SHA512 c3b07e7186fcf5a1f3e73f4e9510dddff2a42c0202bc471a946e38e636af27b2d17206b7105a7a80179fc17ebceab6c2802ff6ddaabae9e16a930dfa1252a2db WHIRLPOOL 2d4402883a480ae3050af18f3fe1aec4110132aa4eda0ce9675f79471a526e8b90b9ebe6a0a5c76321474be6ace963520b903cf809835472649b095be757ec52
 DIST NVIDIA-Linux-x86-319.17.run 27355625 SHA256 779da1eac8826b9586fcbb9fdd9caa488971ea2c0d62c634b4c8b9460e8345c9 SHA512 5961371fee38acacd00029ed6b63cdba7a70a614795552098e186045f61d0f0fdbec55068c9d8cd82cf958ea025bbbf576ac18f36a35458e2c871042965d140e WHIRLPOOL 93855b3bb7215a457e838c130f05854e2d5397f4e6b68a85e607bbd4bd54dc13c7f9e4d6fb4ed9d58d1f28d466093777deccd669a4746d5769a6a27573c6dca3
+DIST NVIDIA-Linux-x86-319.23.run 27347497 SHA256 200dcaec7ec09b7d3bb22eadcd049a4172338bbb04e7de00cf05ce07db452fb8 SHA512 dd5321815f897d770e9df51ccf6078af8b4db52a9ee03c38108f8f0d8737c9da4a4aa987b2e1f8641a26bd36e3c96295d624870352e93727f94e2795ffbd71dd WHIRLPOOL d27f69c9a2a41c5237d03819aa21cc1cbfec641b4ce1368833e14ee5cea4facea3f7c0a6606e597b98ccc908be881677932608b2c26aea18720818a7b240d6bc
 DIST NVIDIA-Linux-x86-96.43.23-pkg0.run 11504817 SHA256 51e6adf4ba73071622045fc37169f80db3ae3e784dff53b29d35146a04042142 SHA512 bed5726e57637481fe4e3c03a65ec14fe949f00860e729ebde408f4fd861d7bfdc296a78bc2f5d42e8b282db09f4bbde1e0545df7228fa20227080dc4b868ba7 WHIRLPOOL 6d4fd1786c11f4e326cc3101d0bb1a2f8b63c25c3dd59f10188f8355759e2861ce44fd53d60258b513d5a1d6124d0f91ba8edf4d3668b6feabfb3e8d585f14fe
 DIST NVIDIA-Linux-x86_64-173.14.37-pkg2.run 20647769 SHA256 3e34a48cf4143469e6ae60c792932b5e920d7244ed374eb818d5d72af94a7809 SHA512 618a4379694a3102a7c0487c552aca3664639c45432b64aadac9f90c0e9dcad4de82b0dec15f7fdf03b2b222713133ee9f4a936755915d38a2c2fef0bc97f342 WHIRLPOOL 9ed7b65a26b6f846d0ec1aeb1eb051331e808c6791ace7324951bdf20861701fc1b9c9cbc00cacd9d86c9d9568509069d9ecf35b7fd8d1c5b5dc0e3ef9c3db0a
 DIST NVIDIA-Linux-x86_64-304.88.run 68041437 SHA256 c1a73211566b085214b0ad1824733aa56d09c6139f729feebd0eff44f6113da3 SHA512 8a907f9ed307b1e4b5563a9aba9d6c1c036885cd64a4a229d6831eb7a855921971e652b7940333e366d5088f97cf3596fb739853b3c3cf94446ee0cea6164ab2 WHIRLPOOL 2e43479bb52d1dcbe1007cda779ab21ed064883769358a09bdd765e55f6b35a855a51006e070d33ddd2a3808802cdb4fa2ae63cc7cc189561934d00574492ca8
@@ -37,6 +40,7 @@ DIST NVIDIA-Linux-x86_64-310.44.run 68380500 SHA256 585365fc37939794ab7ed6907ab2
 DIST NVIDIA-Linux-x86_64-310.51.run 68401088 SHA256 4d0f9829105a8f06121f8308fa5e67834f52b84add48eaf4101b02522db15f53 SHA512 d36406d9adbb77f80386191f623c845977fbbd86c994b60920ba97fff974efd68e4c83d8d8f2bf9323903bc49391f21c82425eef8f011549aa7b4591634232aa WHIRLPOOL c4ef120eb72b0789158e8f6f3806538523a1aff015a78eb6b089aca7baf1e9a4563e4116a22a18c22548a0708ee504f10a94b3f5504e229d69b519615ff12fb5
 DIST NVIDIA-Linux-x86_64-313.30.run 68379307 SHA256 72317f2e4c459c33c764e3283deb3e1615b1852ead1f9bfad82148e120506022 SHA512 ae4439697e47eff98e06e5f77de979bdce096f95efa8bdee9c6fc939b42b5ce3b11c23d7691e974cf0f6f783eeb0fb694670636538352a0e8979f88d687f1f86 WHIRLPOOL c12a68fcc4d78f3856d87a86cef43c3632c0db1b6c5799b6482584d4d83a7cc863b9b394a501b96534175e11663c602d72f6ffa49f85461eaf4324dc61e654ff
 DIST NVIDIA-Linux-x86_64-319.17.run 48595160 SHA256 5579a8c4f5a7927eb9756d276c4e3d60540877cd68f6c946890fddc5d176764a SHA512 b3fa9fb4121a39ec3d8765357ae061b9854f2f2fb4d87a93240cbd464a519752d07b4a2d8f6ec3652a703329e054a6cf95bdf1ab49562b0c84b0fd47d0d8ab4c WHIRLPOOL 49a81c2c485fd07f4165ed4f0eb57cf419900280b43199a4026577f287e7da99262006c987cb56600ca3436b915d81699f81f7ad9abd40782447b55d4e9a5fab
+DIST NVIDIA-Linux-x86_64-319.23.run 48628832 SHA256 d130dd0a9d889063d0dbad0a27789af756076af879a68a5dbc1175821542fa78 SHA512 972c91bb3f6ab5fa76388dd239b4f6ef5876208d8b0b5b766bf9e184cea655f15cf8038b9db686a1bfce6471c95a25ca285700a9d3756849453c150a2ba8a66a WHIRLPOOL 08ba49230326a741230cf6a181c20ac15ca36408cac2997bddc17cf6a164659306341e04236f6a8678733c1bca137b265fe21c7e32f0d70cb62a188b569b9ae8
 DIST NVIDIA-Linux-x86_64-96.43.23-pkg2.run 15962375 SHA256 ce8d8253e7dab7da63fbdac449ebf190cd0c10cbfffea0f8d0165515f851bc64 SHA512 04bec1187a6024a2b9839f008ec829281f1f2602dae2e639030bc385943186506bcaa2b46a230b2ab87f9217190841abc62f9e2d6395ab5559623389c31c6563 WHIRLPOOL 0651c44a51a1a06fcff5bfddbf9c3e408977e03263c7fe806cb6c01f9fe92f716dfe4e5190ffe1048bde72fcffdc8bca8267e74dd43ba5c9dfb22b6201fcc2bb
 EBUILD nvidia-drivers-173.14.37.ebuild 17262 SHA256 df4050c528e175997ae796219214c9d32c20af9d72e7070407ad2749c38464f0 SHA512 47de9b12da75a2bfa705dd8fcf8ca1e5f0d37ebb689b2c69fb33760fc8743dd6305170cda2f2b22e784a86e8b45bb1da9456cbe0985bfd1cd51274fad580052a WHIRLPOOL 60357ae56bf77f5b712cfbf90912056878421814f724f75d69dd57c34d989603fcbd0c7f748eff95e3141142b277f174f9f0b44738ed11d8a665756d29a108fe
 EBUILD nvidia-drivers-304.88.ebuild 13250 SHA256 1388d8de07f3397c21cd2254af1ed23499502906052f37daa1e3da55bf641719 SHA512 2c9bf750193d1e823e04000e774357ed3bfa83e9532a0afb4c634991fe2e64d22b25535cb294aeb343f26b1fd0e08bf6d11e4d236f9c43eec832bbdac6bf27e6 WHIRLPOOL 37013ccca812998faf78308bcdadf79573ff33a32e122406f204934bdfe3e267d065c956e3055d65594c4d893dbac048a0c571183ddd2d21280eb104ab1bd9d5
@@ -44,13 +48,14 @@ EBUILD nvidia-drivers-310.44.ebuild 12840 SHA256 f9bb045d395914caee14c21f6cd7973
 EBUILD nvidia-drivers-310.51.ebuild 12849 SHA256 b9ff793f9fd2ee47bc8975f33bb8fc2992c6b92af12e13005e392aa41871d790 SHA512 e6873ffb1898c52ccc5190056bc77cf8f268ed8b298139a55b3011d3517dddad0febd0dc3dee9ded43c2eb5045e49c1ce0d779052fe1c863ce848fb3eb088397 WHIRLPOOL 1dda64f7e032ff34daf604fa1b4c2c7d4c1b2aba65e8591b04ecafb5346ee672d57816fb44415f19e54741be4458a8ac0fe63a7d6c95d9d18dacd29b7c788d04
 EBUILD nvidia-drivers-313.30.ebuild 12778 SHA256 bcd8b36dea24ef82754ddd1f5f51cb3e73c63d964dcf5991490e169e1c132705 SHA512 f0ee73efa58245a13047547315eb75ad363248a33ae9b6115df0a022877a7ac20498ae947dd0365d3f338544cd4d7de691b6f958323a1b29fd3187b16ee7e20d WHIRLPOOL 4940d2bb6f4685df0d8f126e13ab0ac6b75199faf16e845a070b3dc358c94d7e15941f1835017ee0334fc8d0dab10df0a54387c4d13655c3166c6d4765975f91
 EBUILD nvidia-drivers-319.17.ebuild 12692 SHA256 794326e9228663c847687a38c09264083940cbc72ecb683dc1f3944077697598 SHA512 a48462998490a1c58d62ffb6bdcd1bc6cf1895be1b5a478e78ca0e8d0416f8dd06f469a5aaaa72d9ebce631e7631c6977403a1c1e373cb058284743755c96cb1 WHIRLPOOL 9e5be41deeba103171befdfeaa8a38508772eec4c059184bdcf4bf3fbdfee87ae61af88463065b0bfa81e76fdf3bef4bcfbd51d9f70a8c0e5abe3452c39a9f9b
+EBUILD nvidia-drivers-319.23.ebuild 12696 SHA256 b8c68eba137e6791b87ac831be5ef64e0bd943c5b601701e9946a93fd321395d SHA512 6bae3665e1a208fbb923c95fd0230bb8ea1840088a28ff9de08f02811837bdc8990624ee7fe38446d78703e9be46f58b2d813bf4d22ee746140f702ef93de95e WHIRLPOOL 5ebbf2ad2db72843ec012bfb8de830cc0d8ddb76107ed495ca9f99decf28e2752b96e5688d76ff21e40341438f4983d777ada7504b6038583d59b40ef9d67fe7
 EBUILD nvidia-drivers-96.43.23.ebuild 15936 SHA256 95599e2f2d562c694fa1899d4084ef8588dbe9a1b96a07d98de55953c64ee2f4 SHA512 52ea2ff380fc96ab4cb59e86fe3bf3756285717aeeb92c4866e53e8063e56aad457dd3dcf93f9ff8d2f9646e325975de170d1bc46d5db0a81a17a62b20bbeccd WHIRLPOOL ef0afbb97c4b8708ed1270a0310d1cd2f81e678549d990900f9a22220e88c656d6660b0eeb66ae6360fcc3e12651ade68b3df550832c3e0cbb77221ba7312353
-MISC ChangeLog 95109 SHA256 2c3fcf6a38a28ca2eb8015ce1c11a82d0be4bd5cfd7fdb73228f467c175763d7 SHA512 743f4e4c615defb2c7f49ebf622d94ed89acf6d637f207465f4644cac708f103f07a35786a4262a6ab8a885fa6fa9a5ad1f9a5d0d2ec3962c2d9bc1c31d52d4e WHIRLPOOL 1d0385690aa3f814fab9b6ebdf2f336e40611fa1a700b531fafd998c3e654affb7985180a56ed56973d12de891eb2f4fe30b6af45fc21cc8d9bbee08b5fd492d
+MISC ChangeLog 95242 SHA256 bab55fb9bfb74f7d7a475189d8412921602179531af99d3040fe03e639a8806f SHA512 eef99132460ca0b0633042c4905b083004cc0ece892e9545d7c20698a2005062fe19b4a59672b0524ce70fb61ee923025a71d0f2a740e9cac3a4b24f5cc99249 WHIRLPOOL 025bbc8d2e6cfb65c91c31daf3fb057972a4e3730df025b04fc8a4b3e2fe27110450e58f94c51ba933103a07ba9161585cd8115e974542b91af63f14ba591c85
 MISC metadata.xml 678 SHA256 02f45452a129ba14ad5ef0f6bf0031887aead328a7bfaa6977949bc6e8969e61 SHA512 dfc9494e01db7ee3e7ef64dc67c5e26b1a3b0c90ed2850f75c904a76a11df8b3cb137959fe471c788b7a33f555090a9c764af5cfff7f24253127484d4e518e84 WHIRLPOOL 2940677faa8b8183237d9797025079a68164584d2afd09b6e3846cdbbd5824f3c56da545b2f7d1c7d1e72746f540048e4256bde939a28ac785fa598ee2017abd
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGQ/ZQACgkQVWmRsqeSphMSlQCcCJObxt544onSaMDgeHTFTspP
-oIEAn3ecczWVNCAmnmmO+h/+pDL24MLs
-=qc4e
+iEYEAREIAAYFAlGeMBkACgkQVWmRsqeSphOBlACePVM0TmTlYVvqjn8LFHVzvnRQ
+fdIAn31hqI4TyEDkuOgEnAHwAqLdxp6p
+=H5XN
 -----END PGP SIGNATURE-----
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-319.23.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-319.23.ebuild
new file mode 100644
index 000000000000..84f03722f21b
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-319.23.ebuild
@@ -0,0 +1,459 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/x11-drivers/nvidia-drivers/nvidia-drivers-319.23.ebuild,v 1.1 2013/05/23 15:04:55 jer Exp $
+
+EAPI=5
+
+inherit eutils flag-o-matic linux-info linux-mod multilib nvidia-driver \
+	portability toolchain-funcs unpacker user udev
+
+NV_URI="http://us.download.nvidia.com/XFree86/"
+X86_NV_PACKAGE="NVIDIA-Linux-x86-${PV}"
+AMD64_NV_PACKAGE="NVIDIA-Linux-x86_64-${PV}"
+X86_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86-${PV}"
+AMD64_FBSD_NV_PACKAGE="NVIDIA-FreeBSD-x86_64-${PV}"
+
+DESCRIPTION="NVIDIA X11 driver and GLX libraries"
+HOMEPAGE="http://www.nvidia.com/"
+SRC_URI="
+	amd64-fbsd? ( ${NV_URI}FreeBSD-x86_64/${PV}/${AMD64_FBSD_NV_PACKAGE}.tar.gz )
+	amd64? ( ${NV_URI}Linux-x86_64/${PV}/${AMD64_NV_PACKAGE}.run )
+	x86-fbsd? ( ${NV_URI}FreeBSD-x86/${PV}/${X86_FBSD_NV_PACKAGE}.tar.gz )
+	x86? ( ${NV_URI}Linux-x86/${PV}/${X86_NV_PACKAGE}.run )
+"
+
+LICENSE="GPL-2 NVIDIA-r1"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86 ~amd64-fbsd ~x86-fbsd"
+IUSE="acpi multilib kernel_FreeBSD kernel_linux pax_kernel +tools +X"
+RESTRICT="bindist mirror strip"
+EMULTILIB_PKG="true"
+
+COMMON="
+	app-admin/eselect-opencl
+	kernel_linux? ( >=sys-libs/glibc-2.6.1 )
+	X? (
+		>=app-admin/eselect-opengl-1.0.9
+	)
+"
+DEPEND="
+	${COMMON}
+	app-arch/xz-utils
+	kernel_linux? ( virtual/linux-sources )
+"
+RDEPEND="
+	${COMMON}
+	acpi? ( sys-power/acpid )
+	tools? (
+		dev-libs/atk
+		dev-libs/glib
+		x11-libs/gdk-pixbuf
+		x11-libs/gtk+:2
+		x11-libs/libX11
+		x11-libs/libXext
+		x11-libs/pango[X]
+	)
+	X? (
+		=x11-libs/libvdpau-0.3-r1
+		multilib? (
+			|| (
+				 (
+					x11-libs/libX11[abi_x86_32]
+					x11-libs/libXext[abi_x86_32]
+				 )
+				app-emulation/emul-linux-x86-xlibs
+			)
+		)
+	)
+"
+
+REQUIRED_USE="tools? ( X )"
+
+QA_PREBUILT="opt/* usr/lib*"
+
+S=${WORKDIR}/
+
+pkg_pretend() {
+
+	if use amd64 && has_multilib_profile && \
+		[ "${DEFAULT_ABI}" != "amd64" ]; then
+		eerror "This ebuild doesn't currently support changing your default ABI"
+		die "Unexpected \${DEFAULT_ABI} = ${DEFAULT_ABI}"
+	fi
+
+	if use kernel_linux && kernel_is ge 3 10 ; then
+		ewarn "Gentoo supports kernels which are supported by NVIDIA"
+		ewarn "which are limited to the following kernels:"
+		ewarn " \
+			"${WORKDIR}"/nvidia
+		insinto /etc/modprobe.d
+		newins "${WORKDIR}"/nvidia nvidia.conf
+
+		# Ensures that our device nodes are created when not using X
+		exeinto "$(udev_get_udevdir)"
+		doexe "${FILESDIR}"/nvidia-udev.sh
+		udev_newrules "${FILESDIR}"/nvidia.udev-rule 99-nvidia.rules
+
+	elif use kernel_FreeBSD; then
+		if use x86-fbsd; then
+			insinto /boot/modules
+			doins "${S}/src/nvidia.kld"
+		fi
+
+		exeinto /boot/modules
+		doexe "${S}/src/nvidia.ko"
+	fi
+
+	# NVIDIA kernel <-> userspace driver config lib
+	donvidia ${NV_OBJ}/libnvidia-cfg.so ${NV_SOVER}
+
+	# NVIDIA video encode/decode <-> CUDA
+	if use kernel_linux; then
+		donvidia ${NV_OBJ}/libnvcuvid.so ${NV_SOVER}
+		donvidia ${NV_OBJ}/libnvidia-encode.so ${NV_SOVER}
+	fi
+
+	if use X; then
+		# Xorg DDX driver
+		insinto /usr/$(get_libdir)/xorg/modules/drivers
+		doins ${NV_X11}/nvidia_drv.so
+
+		# Xorg GLX driver
+		donvidia ${NV_X11}/libglx.so ${NV_SOVER} \
+			/usr/$(get_libdir)/opengl/nvidia/extensions
+	fi
+
+	# OpenCL ICD for NVIDIA
+	if use kernel_linux; then
+		insinto /etc/OpenCL/vendors
+		doins ${NV_OBJ}/nvidia.icd
+	fi
+
+	# Documentation
+	dohtml ${NV_DOC}/html/*
+	if use kernel_FreeBSD; then
+		dodoc "${NV_DOC}/README"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1"
+		use tools && doman "${NV_MAN}/nvidia-settings.1"
+	else
+		# Docs
+		newdoc "${NV_DOC}/README.txt" README
+		dodoc "${NV_DOC}/NVIDIA_Changelog"
+		doman "${NV_MAN}/nvidia-smi.1.gz"
+		use X && doman "${NV_MAN}/nvidia-xconfig.1.gz"
+		use tools && doman "${NV_MAN}/nvidia-settings.1.gz"
+		doman "${NV_MAN}/nvidia-cuda-mps-control.1.gz"
+	fi
+
+	# Helper Apps
+	exeinto /opt/bin/
+
+	if use X; then
+		doexe ${NV_OBJ}/nvidia-xconfig
+	fi
+
+	if use kernel_linux ; then
+		doexe ${NV_OBJ}/nvidia-debugdump
+		doexe ${NV_OBJ}/nvidia-cuda-mps-control
+		doexe ${NV_OBJ}/nvidia-cuda-mps-server
+		doexe ${NV_OBJ}/nvidia-smi
+		newinitd "${FILESDIR}/nvidia-smi.init" nvidia-smi
+	fi
+
+	if use tools; then
+		doexe ${NV_OBJ}/nvidia-settings
+	fi
+
+	exeinto /usr/bin/
+	doexe ${NV_OBJ}/nvidia-bug-report.sh
+
+	# Desktop entries for nvidia-settings
+	if use tools ; then
+		# There is no icon in the FreeBSD tarball.
+		use kernel_FreeBSD || newicon ${NV_OBJ}/nvidia-settings.png nvidia-drivers-settings.png
+		domenu "${FILESDIR}"/nvidia-drivers-settings.desktop
+		exeinto /etc/X11/xinit/xinitrc.d
+		doexe "${FILESDIR}"/95-nvidia-settings
+	fi
+
+	#doenvd "${FILESDIR}"/50nvidia-prelink-blacklist
+
+	if has_multilib_profile && use multilib ; then
+		local OABI=${ABI}
+		for ABI in $(get_install_abis) ; do
+			src_install-libs
+		done
+		ABI=${OABI}
+		unset OABI
+	else
+		src_install-libs
+	fi
+
+	is_final_abi || die "failed to iterate through all ABIs"
+}
+
+src_install-libs() {
+	local inslibdir=$(get_libdir)
+	local GL_ROOT="/usr/$(get_libdir)/opengl/nvidia/lib"
+	local CL_ROOT="/usr/$(get_libdir)/OpenCL/vendors/nvidia"
+	local libdir=${NV_OBJ}
+
+	if use kernel_linux && has_multilib_profile && \
+			[[ ${ABI} == "x86" ]] ; then
+		libdir=${NV_OBJ}/32
+	fi
+
+	if use X; then
+		# The GLX libraries
+		donvidia ${libdir}/libGL.so ${NV_SOVER} ${GL_ROOT}
+		donvidia ${libdir}/libnvidia-glcore.so ${NV_SOVER}
+		if use kernel_FreeBSD; then
+			donvidia ${libdir}/libnvidia-tls.so ${NV_SOVER}
+		else
+			donvidia ${libdir}/tls/libnvidia-tls.so ${NV_SOVER}
+		fi
+
+		# VDPAU
+		donvidia ${libdir}/libvdpau_nvidia.so ${NV_SOVER}
+	fi
+
+	# NVIDIA monitoring library
+	if use kernel_linux ; then
+		donvidia ${libdir}/libnvidia-ml.so ${NV_SOVER}
+	fi
+
+	# CUDA & OpenCL
+	if use kernel_linux; then
+		donvidia ${libdir}/libcuda.so ${NV_SOVER}
+		donvidia ${libdir}/libnvidia-compiler.so ${NV_SOVER}
+		donvidia ${libdir}/libOpenCL.so 1.0.0 ${CL_ROOT}
+		donvidia ${libdir}/libnvidia-opencl.so ${NV_SOVER}
+	fi
+}
+
+pkg_preinst() {
+	use kernel_linux && linux-mod_pkg_preinst
+
+	# Clean the dynamic libGL stuff's home to ensure
+	# we dont have stale libs floating around
+	if [ -d "${ROOT}"/usr/lib/opengl/nvidia ] ; then
+		rm -rf "${ROOT}"/usr/lib/opengl/nvidia/*
+	fi
+	# Make sure we nuke the old nvidia-glx's env.d file
+	if [ -e "${ROOT}"/etc/env.d/09nvidia ] ; then
+		rm -f "${ROOT}"/etc/env.d/09nvidia
+	fi
+}
+
+pkg_postinst() {
+	use kernel_linux && linux-mod_pkg_postinst
+
+	# Switch to the nvidia implementation
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old nvidia
+	"${ROOT}"/usr/bin/eselect opencl set --use-old nvidia
+
+	elog "You must be in the video group to use the NVIDIA device"
+	elog "For more info, read the docs at"
+	elog "http://www.gentoo.org/doc/en/nvidia-guide.xml#doc_chap3_sect6"
+	elog
+	elog "This ebuild installs a kernel module and X driver. Both must"
+	elog "match explicitly in their version. This means, if you restart"
+	elog "X, you must modprobe -r nvidia before starting it back up"
+	elog
+	elog "To use the NVIDIA GLX, run \"eselect opengl set nvidia\""
+	elog
+	elog "To use the NVIDIA CUDA/OpenCL, run \"eselect opencl set nvidia\""
+	elog
+	elog "NVIDIA has requested that any bug reports submitted have the"
+	elog "output of /opt/bin/nvidia-bug-report.sh included."
+	elog
+	if ! use X; then
+		elog "You have elected to not install the X.org driver. Along with"
+		elog "this the OpenGL libraries and VDPAU libraries were not"
+		elog "installed. Additionally, once the driver is loaded your card"
+		elog "and fan will run at max speed which may not be desirable."
+		elog "Use the 'nvidia-smi' init script to have your card and fan"
+		elog "speed scale appropriately."
+		elog
+	fi
+	if ! use tools; then
+		elog "USE=tools controls whether the nvidia-settings application"
+		elog "is installed. If you would like to use it, enable that"
+		elog "flag and re-emerge this ebuild. Optionally you can install"
+		elog "media-video/nvidia-settings"
+		elog
+	fi
+}
+
+pkg_prerm() {
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
+
+pkg_postrm() {
+	use kernel_linux && linux-mod_pkg_postrm
+	use X && "${ROOT}"/usr/bin/eselect opengl set --use-old xorg-x11
+}
diff --git a/x11-libs/libdrm/ChangeLog b/x11-libs/libdrm/ChangeLog
index 90b73578eb03..2fb23684fe45 100644
--- a/x11-libs/libdrm/ChangeLog
+++ b/x11-libs/libdrm/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for x11-libs/libdrm
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.222 2013/05/16 01:07:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/ChangeLog,v 1.223 2013/05/23 15:23:11 jer Exp $
+
+  23 May 2013; Jeroen Roovers  libdrm-2.4.45.ebuild:
+  Stable for HPPA (bug #463430).
 
 *libdrm-2.4.45 (16 May 2013)
 
diff --git a/x11-libs/libdrm/Manifest b/x11-libs/libdrm/Manifest
index 37f064b458dd..28862c6bb396 100644
--- a/x11-libs/libdrm/Manifest
+++ b/x11-libs/libdrm/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 2.4.18-0001-datatypes.patch 490 SHA256 0a2ae45b9b4d8d2a9decaba3e32d38ba6d60a081dc15a60ca88e84d1157d7669 SHA512 ca5505b7bcb92d27b3ca1c72b4a9226cf58cdc559199a9e268f55d4ba34fea92c367172ebcba367f682c7b989b797c97b6ddb6564061685fdfa029eae7e469a2 WHIRLPOOL 247c0230279dfa805e8b9a1a213e1e921a5299826078dab2972509676e4e6a303e3cee2e59547f11e8275d13ee703faff57881905f12149e026ca26e427590b6
 AUX libdrm-2.4.28-solaris.patch 3202 SHA256 04440ea802761e27c6f3a39a8bbfba71d707c3b3380885540be2e0f56ef58334 SHA512 5e7edfdad3090a84ef1876281986d0e6af949af6c61eeaff17bf250891d6d7d9f594802f02fe01921c350b05c15e52bc27f3235c3cf4803441a524ea741471d2 WHIRLPOOL bedeb2a2faab18dff6bf5894a3adc9c7a3ccc6f825fa257125be7c25965de3c354f43b4c35b5e370a06d674ec205747fb1d1c5f86329f6c8cfa1cbc33aceeef4
 AUX libdrm-2.4.40-bsd-etime.patch 916 SHA256 9356a077fb1b267cb130e0c080f3bebffbce7ea63da04a5553976c8cd75cd56d SHA512 e768e22152c88e406be596adcca37e030c9343e57fea4014b47740e2208f858d82f3f93f5a00f4f7b5f5f2bd30e841a6393458467b7534fe14f2ce0420a9f25e WHIRLPOOL 8085dd7b3e7666c5c301e33ddb44cb44d7fb88e1d78e278ce0a717888eeb3c0f9bdaf18a3d028f43aa824764523f75e84c92785bfebf94967502043c00431e3f
@@ -14,6 +17,13 @@ EBUILD libdrm-2.4.40.ebuild 1635 SHA256 3f1d299076431fbc48c41b107f409b9030d205f6
 EBUILD libdrm-2.4.42.ebuild 1617 SHA256 0a2918d970d43874b248d33144869f1a3bce9254588676a5166cf25d484b7214 SHA512 2217cdcadccc8443531a92cd3d30da8a4f9bee4f0562d3beeaba77951aad781da725ca772f42eff90d1bb2f08b87ab8c287bb71885b0486bd3cf32e6034af8fd WHIRLPOOL af830cd30ff0c9cc4c1010869aa56dc0b1a87b0a3920f6e9dac332ac7aa9f48525c6e76cbb5e2117d5299f8e473302b23893b1d1cc73f76d2c952d76e03056f7
 EBUILD libdrm-2.4.43.ebuild 1551 SHA256 a2da48d11facaf600993056d6c7967cb7537fb5d2aa20432d70923336a15949d SHA512 349d3cfd1306510d498c0897f24f132ad901374d842c6d88a956faa1878d0ff35f384e8d4909f6237374f6de5b00c2cd03a5e990af2eaa5b27d8a52ac07ec249 WHIRLPOOL 6273b269a0e598fce40fc93aa2357e72ba674bb115eac1a09a35b35a41b8d57cd1ca23175f60b0c591571b2e4e0c8e656c54676cd9c857aeb963d93371552721
 EBUILD libdrm-2.4.44.ebuild 1738 SHA256 aeddedf9dfeaca9d9fe0343243388c71b3ccfc2549a082c2289cd7bc9df232e4 SHA512 c4c5b2095beedf8b218aa0b253108b2d32cad41e8a1baa53e8a6726744ecf10c6f9840f897ec4895267e2eeefb5178f1cc496be020727e785ff8b468e173c39d WHIRLPOOL 7334d830b19da484d84f0bddca440cca2bfb571f248690553027ec6fbe1fc1b8e52f90f60d3eaef3b103c35abb00fdd5ae67ad73bc818ea253ad9751e65376f5
-EBUILD libdrm-2.4.45.ebuild 1738 SHA256 bde8e063a0eb4d42f280c93c0ce7b87c3f002a8e9e8b61daca90fa030850d041 SHA512 55122c97fcd2a16ea1aee6b29d8d086d7ea3cb1fcb09ca3f11e9066fe3e00ed27ce1ee4e8fbbb629b04303aa038d721f962d225eb34387e2306199b3562bf81d WHIRLPOOL 0113e585c2deb744a9c5e6369a089c5fd34bbc478b8c11f6956ee76e5a3b2a5b459bf140cb72341ddb47149310d892fa38b74087f5b3002388622f8f1c11207c
-MISC ChangeLog 30243 SHA256 3cce2bcacc379a7b8a7e20b3e109a0e71e340978c38c1898c29055f8e0aec868 SHA512 20a72113f0e8a9b21e0c96e215dc651f7e77cdd79ffc92370f95ed7a8c7bd204f2caf702427cba06a4c0a2306bf1fc7193001eb646d0215cd29fff9034cd237e WHIRLPOOL 21280cda1d732ca063eb1ab5d801c168495679863568271e57c0eb26ac2a82a4c821dfceaa8ffe9a42ae5268cd8e6075621b77d5ab6944e5a89ed67417ad77bd
+EBUILD libdrm-2.4.45.ebuild 1732 SHA256 55d00c635357546da6eedc1001bb4b4250246c9fc49c7a7bcff140e2b7c8a368 SHA512 b7fc4c07013474026b36df0e503b9e3be8fb87df80a6137dfea1a3f95db15e848032251a27af5d5e4eb63c9c02b28980eedbc6fe943f31d855114f8b07384f2e WHIRLPOOL 48a71e3d2537e0f479dac312dd2b7b954bbf9ea74c34c3f78a34b11c667974616bf222e1b4d031115148c7a65103c96fe886b1113fac709ffc61336040263f95
+MISC ChangeLog 30341 SHA256 dda38a876ff92511bee5963a576202098fb53c3c3d7b9377ce765c8df42f5ce9 SHA512 c653a26ebbbf6672c831060731a7f1e35ca210ee48024ada94f2f3524dde6f6612ef3cf3d7b2704973f6fc45afbf3c870b2580c199c6aea8667da6cc191b40f2 WHIRLPOOL 79b815d36dc5cf3bfe6053afffe685eeea5c13686a428385f08d5f701a22a58965257f6a9fbf5e88f228e596a17425be1dfd5c97ce715a7586571fea262a0723
 MISC metadata.xml 272 SHA256 4c3835edbf1b73ec8a30de26d7db38631dd1ef7782ca160ff8dfe64a767bb771 SHA512 c08dfcd90f1451c0cd9251b91833e8742e723043c2e6632eaab523d61745d0173502ae792225522053671df98aeaf2229783bfd5fe202bf29a166857fe0d8fd1 WHIRLPOOL f3d828a14266066ab3dd5c2970165bf9d1cf3d1c9fffd8d691344c7cc1b8ef011957d66f64b0c328afa64b92d1e154dec619f8f3bd0789edc36be07d33c74900
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGeNGEACgkQVWmRsqeSphMDlgCeKsbO2ceA54oNFX7VMIFjU4mn
+yLkAn2AMr5s7lDnumy6wfKWMXZwZepfv
+=O2l6
+-----END PGP SIGNATURE-----
diff --git a/x11-libs/libdrm/libdrm-2.4.45.ebuild b/x11-libs/libdrm/libdrm-2.4.45.ebuild
index 15e42092626d..2bcc0a2cb6ca 100644
--- a/x11-libs/libdrm/libdrm-2.4.45.ebuild
+++ b/x11-libs/libdrm/libdrm-2.4.45.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/x11-libs/libdrm/libdrm-2.4.45.ebuild,v 1.1 2013/05/16 01:07:00 chithanh Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-libs/libdrm/libdrm-2.4.45.ebuild,v 1.2 2013/05/23 15:23:11 jer Exp $
 
 EAPI=5
 inherit xorg-2
@@ -15,7 +15,7 @@ else
 	SRC_URI="http://dri.freedesktop.org/${PN}/${P}.tar.bz2"
 fi
 
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~amd64-linux ~arm-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 VIDEO_CARDS="exynos freedreno intel nouveau omap radeon vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
diff --git a/x11-misc/dmenu/ChangeLog b/x11-misc/dmenu/ChangeLog
index 4e1d02b99f21..7fc57f530579 100644
--- a/x11-misc/dmenu/ChangeLog
+++ b/x11-misc/dmenu/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for x11-misc/dmenu
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.100 2013/05/20 19:47:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/ChangeLog,v 1.101 2013/05/23 03:31:13 jer Exp $
+
+  23 May 2013; Jeroen Roovers  dmenu-4.5-r3.ebuild,
+  +files/dmenu-4.5-xft-2.patch:
+  Fix font encodings with USE=xft by Eduardo Suarez-Santana (bug #470812).
 
 *dmenu-4.5-r3 (20 May 2013)
 
diff --git a/x11-misc/dmenu/Manifest b/x11-misc/dmenu/Manifest
index 2d258382da36..85df823095f6 100644
--- a/x11-misc/dmenu/Manifest
+++ b/x11-misc/dmenu/Manifest
@@ -1,16 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX dmenu-4.5-xft-2.patch 12640 SHA256 a4bad8b00d9aad39b8b0268ab9afc468b9fbf0e15647d27fd2c97b86faeefaa4 SHA512 a6e6712e49ebd5b883a78f0968074fc89d46acdf3285e464bba62b2c06026958aa3008369a0274fe68332f93fc2259d30c7ae6d96c9597d54cf205161b9d4e81 WHIRLPOOL 9713e6e313c03b90fc112d1d4ebb711253d1632d766966363849b396ce0001cb0244a8c5121ee2da44c0b68fd081c65a4e4469c5fc4f4435f13ba4fee8924c90
 AUX dmenu-4.5-xft.patch 12982 SHA256 858bece229eab333f58071bd6cd9319763b627ef4adf1bdd3629106eca83e446 SHA512 75a24538e040da601e51e5d434b696618fb8f48815d3c8ed7b2fa9d6dc0b3b9703ef6edc7e7a205874173e1d954d936d704b34b7290ec48cfc0da0aafe8daf0f WHIRLPOOL d19462ac11b52def2ce007d4d9a9d76741000a1adbe89164cc71cc2879bfcb6aa5583dbd115a117b222a48fc8fb840165cca9804f38fd09ef1d883906ef923e5
 DIST dmenu-4.5.tar.gz 11543 SHA256 082cd698d82125ca0b3989006fb84ac4675c2a5585bf5bb8af0ea09cfb95a850 SHA512 872dee68c35a93c663eb0a941653eaaa4aa83d8379e05b4dbca089a2c9335036b496de85d8ddf7af1228a5625490a06a89031fb1aac726236b608b952962c248 WHIRLPOOL b91660f3028d314f1a10b994af73e6239c4aaabda6c9ab269bda7e37e0cd22c0eaf3b93998c4cb0fe1f9d8f2fd198afc2e70c237a46921ece9fd9a697f58c869
 EBUILD dmenu-4.5-r2.ebuild 1258 SHA256 c929f072e5f16b8504873747de2b2f81013f1904e8a3acb0e336a6d27b6dbd07 SHA512 d06dc40791b3530937da6a6b4e6c3f24672fffa641288e13cda7ca98ea786ec4c2991cbe32c96fe0b750fe0811aa5f163182a56ba53476acb57d96619f286479 WHIRLPOOL b66ec2f57caea0367033231940262a870fd35e00508a2691a000398babc3476d4b6bddb11afc728460fd82307448c3c34148b6b9ebe2920e148c60d61826cf22
-EBUILD dmenu-4.5-r3.ebuild 1472 SHA256 58ab68fc571b7ce9895bea9538ae4b7adb04cb49643fbe0e93289f7e668c768a SHA512 a2cf7e8cfb848a19b486ae03d7f86cb2f1517f2fccd440a22fbc5d631001dceafbf08a26ba1ad437181177327e86930f4dcc79d781dc9b84fea40861b86a421d WHIRLPOOL 229144e380738b512278d6eb9575188200210d4df69ca535eb03d61cdbd3e1f9876daaed8905ec7e568d8e7436eff38f954b2ac44e24f737b9472518b47826cb
-MISC ChangeLog 11221 SHA256 7b961e61863983b6311c5a766185eb1dc232cb25a5284b56ed89690d4ca569ea SHA512 a9461d9055f4ff86e31b2475dd458aed6b3420c9b4d07d4e1e5e3cf44a89bd8cbc5eea3e43f070440a372013fdc0877e391454d533571f6cbbd2ef62a3008baf WHIRLPOOL 18686558679a3a92d5e5cc09f683b66439f3047ac6ddca36a6e59e6fd13ac4d91fb9e11234aa383c19fdfc5e656fd1cd71e763e86ddeca9163e041c1b11f20fd
+EBUILD dmenu-4.5-r3.ebuild 1474 SHA256 41e711215e02b1a9286f2f32f261cee9388494be92c66fc99aaa312d0f773c06 SHA512 2ea37e651f4589ce9335521a475f7a1a139f735257aa2d4d8544321cb019f25798c585e829917c916c5ab699ce8d1869c5f9c0b436c8bc0f51bf77eae2921caf WHIRLPOOL aa3dc68bcf2c45de7b91a25dc838ce1693f29a85bf2024e03b2b07c863727e5977ea9d447e51d49d0ab36c3edcfbdbfbe1d163d730173a526f5b9d47149aceaa
+MISC ChangeLog 11397 SHA256 613c35ca8e338f0619360105a01ee9ac4abe628bf26d2ce6185a5fba9495c94e SHA512 fb5973c2504a5bf337d06ee6976f67e9a47108a67fb45ce4dfd0e89ce4da5cd9de4d0db93dc68287fae183927d04feffbd9306ba3603f299b768b8c1935dafcc WHIRLPOOL 3fabebfd5d0832f28fbf0a6f14ad9c939808f6336c1075ec98b77b3a043ea5f2f8e20bd629fbc9278b2b95343b4919675e9432a4cf49baab742f55fc8c6d33a6
 MISC metadata.xml 419 SHA256 cfdd16257ce31f12950af301a8938acd161fc41911272019f3ca671dcea02eaa SHA512 bc55bd23f992945125999acda0ca5de3faba1450bb1c101920c78363a71f5578833e6777a1441adb6aa0c6ecaef32a7ac94fd86641f591278d0134e4f18034de WHIRLPOOL 28b5621de931057e19afee0b3220f3a5dbbdfe6f109aaa9269a06098ec732b476dd6319e1f12003199eaa33d5a949c540ef27490d3eadaec9dfc2d24c5670eac
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlGafbcACgkQVWmRsqeSphOO5QCeMAalxHxv8NuB0UPOymwlEXhs
-wwsAn2kmCaDI/3OPL3z/4QyebA2v8ZTP
-=WCBw
+iEYEAREIAAYFAlGdjYIACgkQVWmRsqeSphPoZwCdHpHaiTN2W18C/gDn0Yc/KVji
+CwwAn0baQ078T/XiDN77StI0sIQ3qpRq
+=KCMT
 -----END PGP SIGNATURE-----
diff --git a/x11-misc/dmenu/dmenu-4.5-r3.ebuild b/x11-misc/dmenu/dmenu-4.5-r3.ebuild
index 82227c5fc130..a8df46bfb51a 100644
--- a/x11-misc/dmenu/dmenu-4.5-r3.ebuild
+++ b/x11-misc/dmenu/dmenu-4.5-r3.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/x11-misc/dmenu/dmenu-4.5-r3.ebuild,v 1.1 2013/05/20 19:47:01 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/x11-misc/dmenu/dmenu-4.5-r3.ebuild,v 1.2 2013/05/23 03:31:13 jer Exp $
 
 EAPI=5
 inherit eutils toolchain-funcs
@@ -35,7 +35,7 @@ src_prepare() {
 		-e 's|^	@|	|g' \
 		-e '/^	echo/d' \
 		Makefile || die
-	use xft && epatch "${FILESDIR}"/${PN}-4.5-xft.patch
+	use xft && epatch "${FILESDIR}"/${PN}-4.5-xft-2.patch
 
 	epatch_user
 }
diff --git a/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch b/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch
new file mode 100644
index 000000000000..9dea981e4fe8
--- /dev/null
+++ b/x11-misc/dmenu/files/dmenu-4.5-xft-2.patch
@@ -0,0 +1,410 @@
+--- a/dmenu-4.5/config.mk	2012-01-08 12:18:43.000000000 +0000
++++ b/dmenu-4.5/config.mk	2013-05-17 10:47:11.964786792 +0100
+@@ -12,9 +12,13 @@ X11LIB = /usr/X11R6/lib
+ XINERAMALIBS  = -lXinerama
+ XINERAMAFLAGS = -DXINERAMA
+ 
++# Xft, comment if you don't want it
++XFTINC = $(shell pkg-config --cflags xft)
++XFTLIBS = $(shell pkg-config --libs xft)
++
+ # includes and libs
+-INCS = -I${X11INC}
+-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS}
++INCS = -I${X11INC} ${XFTINC}
++LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS}
+ 
+ # flags
+ CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
+--- a/dmenu-4.5/dmenu.1	2012-01-08 12:18:43.000000000 +0000
++++ b/dmenu-4.5/dmenu.1	2013-05-17 10:47:11.964786792 +0100
+@@ -53,7 +53,7 @@ dmenu lists items vertically, with the g
+ defines the prompt to be displayed to the left of the input field.
+ .TP
+ .BI \-fn " font"
+-defines the font or font set used.
++defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font)
+ .TP
+ .BI \-nb " color"
+ defines the normal background color.
+--- a/dmenu-4.5/dmenu.c	2012-01-08 12:18:43.000000000 +0000
++++ b/dmenu-4.5/dmenu.c	2013-05-17 10:47:11.964786792 +0100
+@@ -17,6 +17,7 @@
+                              * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
+ #define MIN(a,b)              ((a) < (b) ? (a) : (b))
+ #define MAX(a,b)              ((a) > (b) ? (a) : (b))
++#define DEFFONT "fixed" /* xft example: "Monospace-11" */
+ 
+ typedef struct Item Item;
+ struct Item {
+@@ -26,6 +27,7 @@ struct Item {
+ 
+ static void appenditem(Item *item, Item **list, Item **last);
+ static void calcoffsets(void);
++static void cleanup(void);
+ static char *cistrstr(const char *s, const char *sub);
+ static void drawmenu(void);
+ static void grabkeyboard(void);
+@@ -50,10 +52,12 @@ static const char *normfgcolor = "#bbbbb
+ static const char *selbgcolor  = "#005577";
+ static const char *selfgcolor  = "#eeeeee";
+ static unsigned int lines = 0;
+-static unsigned long normcol[ColLast];
+-static unsigned long selcol[ColLast];
++static ColorSet *normcol;
++static ColorSet *selcol;
+ static Atom clip, utf8;
+ static Bool topbar = True;
++static Bool running = True;
++static int ret = 0;
+ static DC *dc;
+ static Item *items = NULL;
+ static Item *matches, *matchend;
+@@ -104,7 +108,9 @@ main(int argc, char *argv[]) {
+ 			usage();
+ 
+ 	dc = initdc();
+-	initfont(dc, font);
++	initfont(dc, font ? font : DEFFONT);
++	normcol = initcolor(dc, normfgcolor, normbgcolor);
++	selcol = initcolor(dc, selfgcolor, selbgcolor);
+ 
+ 	if(fast) {
+ 		grabkeyboard();
+@@ -117,7 +123,8 @@ main(int argc, char *argv[]) {
+ 	setup();
+ 	run();
+ 
+-	return 1; /* unreachable */
++	cleanup();
++	return ret;
+ }
+ 
+ void
+@@ -160,6 +167,15 @@ cistrstr(const char *s, const char *sub)
+ }
+ 
+ void
++cleanup(void) {
++    freecol(dc, normcol);
++    freecol(dc, selcol);
++    XDestroyWindow(dc->dpy, win);
++    XUngrabKeyboard(dc->dpy, CurrentTime);
++    freedc(dc);
++}
++
++void
+ drawmenu(void) {
+ 	int curpos;
+ 	Item *item;
+@@ -167,7 +183,7 @@ drawmenu(void) {
+ 	dc->x = 0;
+ 	dc->y = 0;
+ 	dc->h = bh;
+-	drawrect(dc, 0, 0, mw, mh, True, BG(dc, normcol));
++	drawrect(dc, 0, 0, mw, mh, True, normcol->BG);
+ 
+ 	if(prompt) {
+ 		dc->w = promptw;
+@@ -178,7 +194,7 @@ drawmenu(void) {
+ 	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
+ 	drawtext(dc, text, normcol);
+ 	if((curpos = textnw(dc, text, cursor) + dc->h/2 - 2) < dc->w)
+-		drawrect(dc, curpos, 2, 1, dc->h - 4, True, FG(dc, normcol));
++		drawrect(dc, curpos, 2, 1, dc->h - 4, True, normcol->FG);
+ 
+ 	if(lines > 0) {
+ 		/* draw vertical list */
+@@ -321,7 +337,8 @@ keypress(XKeyEvent *ev) {
+ 		sel = matchend;
+ 		break;
+ 	case XK_Escape:
+-		exit(EXIT_FAILURE);
++        ret = EXIT_FAILURE;
++        running = False;
+ 	case XK_Home:
+ 		if(sel == matches) {
+ 			cursor = 0;
+@@ -359,7 +376,8 @@ keypress(XKeyEvent *ev) {
+ 	case XK_Return:
+ 	case XK_KP_Enter:
+ 		puts((sel && !(ev->state & ShiftMask)) ? sel->text : text);
+-		exit(EXIT_SUCCESS);
++		ret = EXIT_SUCCESS;
++		running = False;
+ 	case XK_Right:
+ 		if(text[cursor] != '\0') {
+ 			cursor = nextrune(+1);
+@@ -490,7 +508,7 @@ void
+ run(void) {
+ 	XEvent ev;
+ 
+-	while(!XNextEvent(dc->dpy, &ev)) {
++	while(running && !XNextEvent(dc->dpy, &ev)) {
+ 		if(XFilterEvent(&ev, win))
+ 			continue;
+ 		switch(ev.type) {
+@@ -524,11 +542,6 @@ setup(void) {
+ 	XineramaScreenInfo *info;
+ #endif
+ 
+-	normcol[ColBG] = getcolor(dc, normbgcolor);
+-	normcol[ColFG] = getcolor(dc, normfgcolor);
+-	selcol[ColBG]  = getcolor(dc, selbgcolor);
+-	selcol[ColFG]  = getcolor(dc, selfgcolor);
+-
+ 	clip = XInternAtom(dc->dpy, "CLIPBOARD",   False);
+ 	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
+ 
+@@ -582,7 +595,7 @@ setup(void) {
+ 
+ 	/* create menu window */
+ 	swa.override_redirect = True;
+-	swa.background_pixel = normcol[ColBG];
++	swa.background_pixel = normcol->BG;
+ 	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
+ 	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
+ 	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
+--- a/dmenu-4.5/draw.c	2012-01-08 12:18:43.000000000 +0000
++++ b/dmenu-4.5/draw.c	2013-05-17 10:47:54.491105887 +0100
+@@ -9,9 +9,6 @@
+ 
+ #define MAX(a, b)  ((a) > (b) ? (a) : (b))
+ #define MIN(a, b)  ((a) < (b) ? (a) : (b))
+-#define DEFAULTFN  "fixed"
+-
+-static Bool loadfont(DC *dc, const char *fontstr);
+ 
+ void
+ drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
+@@ -23,7 +20,7 @@ drawrect(DC *dc, int x, int y, unsigned
+ }
+ 
+ void
+-drawtext(DC *dc, const char *text, unsigned long col[ColLast]) {
++drawtext(DC *dc, const char *text, ColorSet *col) {
+ 	char buf[BUFSIZ];
+ 	size_t mn, n = strlen(text);
+ 
+@@ -35,19 +32,24 @@ drawtext(DC *dc, const char *text, unsig
+ 	if(mn < n)
+ 		for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
+ 
+-	drawrect(dc, 0, 0, dc->w, dc->h, True, BG(dc, col));
++	drawrect(dc, 0, 0, dc->w, dc->h, True, col->BG);
+ 	drawtextn(dc, buf, mn, col);
+ }
+ 
+ void
+-drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]) {
++drawtextn(DC *dc, const char *text, size_t n, ColorSet *col) {
+ 	int x = dc->x + dc->font.height/2;
+ 	int y = dc->y + dc->font.ascent+1;
+ 
+-	XSetForeground(dc->dpy, dc->gc, FG(dc, col));
+-	if(dc->font.set)
++	XSetForeground(dc->dpy, dc->gc, col->FG);
++	if(dc->font.xft_font) {
++		if (!dc->xftdraw)
++			eprintf("error, xft drawable does not exist");
++		XftDrawStringUtf8(dc->xftdraw, &col->FG_xft,
++			dc->font.xft_font, x, y, (unsigned char*)text, n);
++	} else if(dc->font.set) {
+ 		XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
+-	else {
++	} else {
+ 		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
+ 		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
+ 	}
+@@ -69,16 +71,33 @@ eprintf(const char *fmt, ...) {
+ }
+ 
+ void
++freecol(DC *dc, ColorSet *col) {
++    if(col) {
++        if(&col->FG_xft)
++            XftColorFree(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
++                DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), &col->FG_xft);
++        free(col); 
++    }
++}
++
++void
+ freedc(DC *dc) {
++    if(dc->font.xft_font) {
++        XftFontClose(dc->dpy, dc->font.xft_font);
++        XftDrawDestroy(dc->xftdraw);
++    }
+ 	if(dc->font.set)
+ 		XFreeFontSet(dc->dpy, dc->font.set);
+-	if(dc->font.xfont)
++    if(dc->font.xfont)
+ 		XFreeFont(dc->dpy, dc->font.xfont);
+-	if(dc->canvas)
++    if(dc->canvas)
+ 		XFreePixmap(dc->dpy, dc->canvas);
+-	XFreeGC(dc->dpy, dc->gc);
+-	XCloseDisplay(dc->dpy);
+-	free(dc);
++	if(dc->gc)
++        XFreeGC(dc->dpy, dc->gc);
++	if(dc->dpy)
++        XCloseDisplay(dc->dpy);
++	if(dc)
++        free(dc);
+ }
+ 
+ unsigned long
+@@ -91,6 +110,20 @@ getcolor(DC *dc, const char *colstr) {
+ 	return color.pixel;
+ }
+ 
++ColorSet *
++initcolor(DC *dc, const char * foreground, const char * background) {
++	ColorSet * col = (ColorSet *)malloc(sizeof(ColorSet));
++	if(!col)
++		eprintf("error, cannot allocate memory for color set");
++	col->BG = getcolor(dc, background);
++	col->FG = getcolor(dc, foreground);
++	if(dc->font.xft_font)
++		if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
++			DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), foreground, &col->FG_xft))
++			eprintf("error, cannot allocate xft font color '%s'\n", foreground);
++	return col;
++}
++
+ DC *
+ initdc(void) {
+ 	DC *dc;
+@@ -109,23 +142,11 @@ initdc(void) {
+ 
+ void
+ initfont(DC *dc, const char *fontstr) {
+-	if(!loadfont(dc, fontstr ? fontstr : DEFAULTFN)) {
+-		if(fontstr != NULL)
+-			fprintf(stderr, "cannot load font '%s'\n", fontstr);
+-		if(fontstr == NULL || !loadfont(dc, DEFAULTFN))
+-			eprintf("cannot load font '%s'\n", DEFAULTFN);
+-	}
+-	dc->font.height = dc->font.ascent + dc->font.descent;
+-}
+-
+-Bool
+-loadfont(DC *dc, const char *fontstr) {
+ 	char *def, **missing, **names;
+ 	int i, n;
+ 	XFontStruct **xfonts;
+ 
+-	if(!*fontstr)
+-		return False;
++	missing = NULL;
+ 	if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
+ 		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
+ 		for(i = 0; i < n; i++) {
+@@ -133,15 +154,21 @@ loadfont(DC *dc, const char *fontstr) {
+ 			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
+ 			dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
+ 		}
+-	}
+-	else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
+-		dc->font.ascent  = dc->font.xfont->ascent;
++    } else if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
++		dc->font.ascent = dc->font.xfont->ascent;
+ 		dc->font.descent = dc->font.xfont->descent;
+ 		dc->font.width   = dc->font.xfont->max_bounds.width;
++	} else if((dc->font.xft_font = XftFontOpenName(dc->dpy, DefaultScreen(dc->dpy), fontstr))) {
++		dc->font.ascent = dc->font.xft_font->ascent;
++		dc->font.descent = dc->font.xft_font->descent;
++		dc->font.width = dc->font.xft_font->max_advance_width;
++	} else {
++		eprintf("cannot load font '%s'\n", fontstr);
+ 	}
+ 	if(missing)
+ 		XFreeStringList(missing);
+-	return dc->font.set || dc->font.xfont;
++	dc->font.height = dc->font.ascent + dc->font.descent;
++	return;
+ }
+ 
+ void
+@@ -151,20 +178,29 @@ mapdc(DC *dc, Window win, unsigned int w
+ 
+ void
+ resizedc(DC *dc, unsigned int w, unsigned int h) {
++	int screen = DefaultScreen(dc->dpy);
+ 	if(dc->canvas)
+ 		XFreePixmap(dc->dpy, dc->canvas);
+ 
+ 	dc->w = w;
+ 	dc->h = h;
+ 	dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
+-	                           DefaultDepth(dc->dpy, DefaultScreen(dc->dpy)));
++	                           DefaultDepth(dc->dpy, screen));
++	if(dc->font.xft_font && !(dc->xftdraw)) {
++		dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas, DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen));
++		if(!(dc->xftdraw))
++			eprintf("error, cannot create xft drawable\n");
++	}
+ }
+ 
+ int
+ textnw(DC *dc, const char *text, size_t len) {
+-	if(dc->font.set) {
++	if(dc->font.xft_font) {
++		XGlyphInfo gi;
++		XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const FcChar8*)text, len, &gi);
++		return gi.width;
++	} else if(dc->font.set) {
+ 		XRectangle r;
+-
+ 		XmbTextExtents(dc->font.set, text, len, NULL, &r);
+ 		return r.width;
+ 	}
+--- a/dmenu-4.5/draw.h	2012-01-08 12:18:43.000000000 +0000
++++ b/dmenu-4.5/draw.h	2013-05-17 10:47:11.964786792 +0100
+@@ -1,9 +1,6 @@
+ /* See LICENSE file for copyright and license details. */
+ 
+-#define FG(dc, col)  ((col)[(dc)->invert ? ColBG : ColFG])
+-#define BG(dc, col)  ((col)[(dc)->invert ? ColFG : ColBG])
+-
+-enum { ColBG, ColFG, ColBorder, ColLast };
++#include 
+ 
+ typedef struct {
+ 	int x, y, w, h;
+@@ -11,6 +8,7 @@ typedef struct {
+ 	Display *dpy;
+ 	GC gc;
+ 	Pixmap canvas;
++	XftDraw *xftdraw;
+ 	struct {
+ 		int ascent;
+ 		int descent;
+@@ -18,15 +16,24 @@ typedef struct {
+ 		int width;
+ 		XFontSet set;
+ 		XFontStruct *xfont;
++		XftFont *xft_font;
+ 	} font;
+ } DC;  /* draw context */
+ 
++typedef struct {
++	unsigned long FG;
++	XftColor FG_xft;
++	unsigned long BG;
++} ColorSet;
++
+ void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color);
+-void drawtext(DC *dc, const char *text, unsigned long col[ColLast]);
+-void drawtextn(DC *dc, const char *text, size_t n, unsigned long col[ColLast]);
++void drawtext(DC *dc, const char *text, ColorSet *col);
++void drawtextn(DC *dc, const char *text, size_t n, ColorSet *col);
++void freecol(DC *dc, ColorSet *col);
+ void eprintf(const char *fmt, ...);
+ void freedc(DC *dc);
+ unsigned long getcolor(DC *dc, const char *colstr);
++ColorSet *initcolor(DC *dc, const char *foreground, const char *background);
+ DC *initdc(void);
+ void initfont(DC *dc, const char *fontstr);
+ void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
diff --git a/x11-wm/goomwwm/ChangeLog b/x11-wm/goomwwm/ChangeLog
new file mode 100644
index 000000000000..074e5f8459e2
--- /dev/null
+++ b/x11-wm/goomwwm/ChangeLog
@@ -0,0 +1,12 @@
+# ChangeLog for x11-wm/goomwwm
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/x11-wm/goomwwm/ChangeLog,v 1.2 2013/05/22 22:00:18 jer Exp $
+
+  22 May 2013; Jeroen Roovers  goomwwm-1.0.0.ebuild:
+  Marked ~x86 too.
+
+*goomwwm-1.0.0 (22 May 2013)
+
+  22 May 2013; Jeroen Roovers  +goomwwm-1.0.0.ebuild,
+  +metadata.xml:
+  Initial commit.
diff --git a/x11-wm/goomwwm/Manifest b/x11-wm/goomwwm/Manifest
new file mode 100644
index 000000000000..7efc8a0e8486
--- /dev/null
+++ b/x11-wm/goomwwm/Manifest
@@ -0,0 +1,14 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
+DIST goomwwm-1.0.0.tar.gz 69967 SHA256 2c65c9002e8254bc51f86c8bdf8b1a04f24c2c6006bbe6244cc85e9e8b9679ae SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de WHIRLPOOL 6b86018714f4752e3250d8bc495290142d723fbfaaf0e36a426f84f5c31ca2aab38409f84e543d5844c121265ce49137c01d5263d8090eb398d0ddb9564c5e4a
+EBUILD goomwwm-1.0.0.ebuild 820 SHA256 a2c69fee83a570d12dfc2dff4af0c32d73155ca608fb7cdc0e203588f28e46ad SHA512 497c1ba568d88e981ccc1b41bd0e4c4aad8a20469e9c0121640322ed28086563f53468a42303e1cee25816ced2352a5737f32968b2d5cca0a835aa5ac79cd511 WHIRLPOOL 9f5924577b26e9646364908577c9c78cd4178cca5c11ddc9f324dce0c52fb2f4004f568ba215f845afc70eae1a0ad39a171a0c2deb816ea7a94d70df2d585b44
+MISC ChangeLog 422 SHA256 1646bbe5674d86cfc25f19d11084e8205e78dbf1b33b4f2eac49e32802818d48 SHA512 33d9ac619746a7954513ed817373bb39c530626ba87f202e5250bda6b15a4757e36b0f110019d99b40830472bcb88a652a20f4c451d2dc467c48f9681d9c89eb WHIRLPOOL 62bd2ef14b0e8560be87150b378c9f31ead9c61df5b4ddd4d77c3fe45415d6fa56b2d2c01687efc0411098e66b4ea9474e2edfb92d85e4be4fbbd2794adfd339
+MISC metadata.xml 225 SHA256 3f19179bb9336815d32a7a92cc2a3bc7307c3fffc0443587ff818b76bb4ad8a0 SHA512 192294964ec170f533a3115f035540a960ad1f812f2a9730f54a441af5fe36f8e15b04c41a1449afe9070558439058f26fc5449d58fbd7a34001807a31ded189 WHIRLPOOL f6c5c190577e86b82de689a626dac9eb4439c20fe683ba611e98842edf74d605fa66e4b87ecae237ce82ef42c9f6d4d842d3de8b578aac9265e7a717d1c5c1be
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlGdP/MACgkQVWmRsqeSphPFmACfSBv+HtAL9XIqvOwP3/0RVUxl
+Y9EAn2/UZli9DXbx95n52h0x590ylNUP
+=yFy6
+-----END PGP SIGNATURE-----
diff --git a/x11-wm/goomwwm/goomwwm-1.0.0.ebuild b/x11-wm/goomwwm/goomwwm-1.0.0.ebuild
new file mode 100644
index 000000000000..4f4b18b741d0
--- /dev/null
+++ b/x11-wm/goomwwm/goomwwm-1.0.0.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/x11-wm/goomwwm/goomwwm-1.0.0.ebuild,v 1.2 2013/05/22 22:00:18 jer Exp $
+
+EAPI=5
+inherit eutils flag-o-matic toolchain-funcs
+
+DESCRIPTION="Get out of my way, Window Manager!"
+HOMEPAGE="http://aerosuidae.net/goomwwm/"
+SRC_URI="http://aerosuidae.net/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="debug"
+
+RDEPEND="
+	x11-libs/libXft
+	x11-libs/libX11
+	x11-libs/libXinerama
+"
+DEPEND="
+	${RDEPEND}
+	virtual/pkgconfig
+	x11-proto/xineramaproto
+	x11-proto/xproto
+"
+
+src_configure() {
+	use debug && append-cflags -DDEBUG
+	append-cflags -include proto.h
+}
+
+src_compile() {
+	emake \
+		CC=$(tc-getCC) \
+		proto normal
+}
+
+src_install() {
+	dobin ${PN}
+	doman ${PN}.1
+}
diff --git a/x11-wm/goomwwm/metadata.xml b/x11-wm/goomwwm/metadata.xml
new file mode 100644
index 000000000000..704d8f91190c
--- /dev/null
+++ b/x11-wm/goomwwm/metadata.xml
@@ -0,0 +1,9 @@
+
+
+
+
+jer@gentoo.org
+Jeroen Roovers
+
+
+