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/Manifest b/app-benchmarks/siege/Manifest index e9e564c32163..11b32b6712bd 100644 --- a/app-benchmarks/siege/Manifest +++ b/app-benchmarks/siege/Manifest @@ -3,3 +3,4 @@ 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 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/Manifest b/app-emacs/evil/Manifest index aa0dc8a37128..7708b6419595 100644 --- a/app-emacs/evil/Manifest +++ b/app-emacs/evil/Manifest @@ -1 +1,2 @@ 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 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/Manifest b/app-emulation/libvirt/Manifest index 024104a8b528..6ae7924a5b13 100644 --- a/app-emulation/libvirt/Manifest +++ b/app-emulation/libvirt/Manifest @@ -1,9 +1,6 @@ -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 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/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/Manifest b/app-i18n/transifex-client/Manifest index 367168a21abf..d0c0e287d9bf 100644 --- a/app-i18n/transifex-client/Manifest +++ b/app-i18n/transifex-client/Manifest @@ -1 +1,2 @@ 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 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/Manifest b/app-misc/gramps/Manifest index ebb2d08ac1a6..ee1db43f629d 100644 --- a/app-misc/gramps/Manifest +++ b/app-misc/gramps/Manifest @@ -1,2 +1,3 @@ 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 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/Manifest b/app-misc/jq/Manifest index d865d689453e..a0f2848854c8 100644 --- a/app-misc/jq/Manifest +++ b/app-misc/jq/Manifest @@ -1 +1,2 @@ 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 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/Manifest b/app-text/libodfgen/Manifest index c20552856ae1..c5043fa402d8 100644 --- a/app-text/libodfgen/Manifest +++ b/app-text/libodfgen/Manifest @@ -1 +1 @@ -DIST libodfgen-0.0.1.tar.xz 270304 SHA256 dc1478b8f9acc9cfa59b9b206eb4fc9c082f640d7c35e9a6f6dbf025c60e2ff2 SHA512 defc4379b15bc0a0c9d68462eae1e25eaa768de01f88d814babfc9b88ab2ac57de2d0d2fe6303a1194f1b2d1bdb47d6b9d3f88dfba4a4476ecd1dc230d79978a WHIRLPOOL 4e7365197cd639607c1088d31c67a3d02fb58755c090ac4dfd5da7ca678c22b48062be78412eabc6257ea4cd1cec2dde20620c625be6560b084e44cf513fcf6e +DIST libodfgen-0.0.2.tar.xz 270992 SHA256 6fe7932d86df6e7299ffc7377ab76638d5e54454fa8e614bad5b694b398ada2a SHA512 bd6735ad3f1d6a4ad4465a9975766e5d2bbcfb30ee6b3a28926147360c57420b533779ba3732ef5fc51f0c880a479bdc4dea163966cc8f414ff269c259db8cb1 WHIRLPOOL 188cc8a43b5b15c964fc556ddb57d66ab15263255427afe56926726da8e3e57d67b6991d14f14bc851dfd6fa34688bf4481d710b8c2a9164000f2711e7f196a1 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/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/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/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/Manifest b/dev-java/icedtea/Manifest index e8759f68f296..e1d3931eacfc 100644 --- a/dev-java/icedtea/Manifest +++ b/dev-java/icedtea/Manifest @@ -7,8 +7,11 @@ 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 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/Manifest b/dev-java/jfreechart/Manifest index 87fb1b14d3f2..722c5e9aecc4 100644 --- a/dev-java/jfreechart/Manifest +++ b/dev-java/jfreechart/Manifest @@ -1 +1,2 @@ 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 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/Manifest b/dev-lang/R/Manifest index 891067a5d8fe..332dee311d7d 100644 --- a/dev-lang/R/Manifest +++ b/dev-lang/R/Manifest @@ -5,4 +5,5 @@ 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 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/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/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/Manifest b/dev-libs/libnl/Manifest index 2e46eebcf0de..97de262da777 100644 --- a/dev-libs/libnl/Manifest +++ b/dev-libs/libnl/Manifest @@ -2,16 +2,8 @@ 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 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/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/Manifest b/dev-python/cython/Manifest
index 245304de351a..3b670f64da2b 100644
--- a/dev-python/cython/Manifest
+++ b/dev-python/cython/Manifest
@@ -1,7 +1,6 @@
-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
+DIST Cython-0.19.tar.gz 1382384 SHA256 2f861fbb2aca49a352a5cf00a65d4383b7ca56a60b50ea813e59a7a9ae6cd7db SHA512 aaeccfce6ff1a185ca4fcb6f704e963be2f984e7e626053f78ddeac1f137caabb7d4d3de0fd3d7fd99b418bbfdbadade20c0d58f364ca39d1801ad15989bbe57 WHIRLPOOL ee4f45eaf03e48edc4489470a8e0ef72c6be13a99a9f2174fc57830139b98b8770be4a8a7f2717a004cf3b8f79bb11a9870831753e441bd77243e29aa9764d5d
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/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/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/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/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}]
+	! /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/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/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/Manifest b/dev-python/py/Manifest
index e3ba3e820206..15bae4dad7bd 100644
--- a/dev-python/py/Manifest
+++ b/dev-python/py/Manifest
@@ -2,6 +2,7 @@ DIST py-1.4.10.zip 225401 SHA256 b4607de3fe00363067e4e3f1eb6940ce096a8e3f3f835ed
 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
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/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/Manifest b/dev-python/rdflib/Manifest
index c6ff537c83d6..b0a405a23609 100644
--- a/dev-python/rdflib/Manifest
+++ b/dev-python/rdflib/Manifest
@@ -2,4 +2,5 @@ DIST rdflib-3.1.0.tar.gz 249824 SHA256 eafa2a6abfde24f08bc8af0b43084bd30a00d9457
 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
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/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/Manifest b/dev-python/xlrd/Manifest
index 2f064dac849c..504417de2ba9 100644
--- a/dev-python/xlrd/Manifest
+++ b/dev-python/xlrd/Manifest
@@ -1,3 +1,4 @@
 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
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/Manifest b/dev-ruby/amq-client/Manifest
index 0b1feff6e270..0e20f9c66dc2 100644
--- a/dev-ruby/amq-client/Manifest
+++ b/dev-ruby/amq-client/Manifest
@@ -1,2 +1,3 @@
 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
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/Manifest b/dev-ruby/amq-protocol/Manifest
index 299cfb89f14c..cd66f6aa554b 100644
--- a/dev-ruby/amq-protocol/Manifest
+++ b/dev-ruby/amq-protocol/Manifest
@@ -1,3 +1,4 @@
 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
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/Manifest b/dev-ruby/amqp/Manifest
index f86bc3fa8765..bab4e299febe 100644
--- a/dev-ruby/amqp/Manifest
+++ b/dev-ruby/amqp/Manifest
@@ -1,3 +1,2 @@
 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
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/Manifest b/dev-ruby/mocha/Manifest
index 600579eba572..710518383e5d 100644
--- a/dev-ruby/mocha/Manifest
+++ b/dev-ruby/mocha/Manifest
@@ -1,6 +1,4 @@
 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
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/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/Manifest b/dev-util/debootstrap/Manifest
index 660ca99c2b39..601edc6e27f1 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -4,4 +4,5 @@ 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
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/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/Manifest b/dev-vcs/bzr-explorer/Manifest
index 44fde5789b45..1209172cb63d 100644
--- a/dev-vcs/bzr-explorer/Manifest
+++ b/dev-vcs/bzr-explorer/Manifest
@@ -1,3 +1 @@
-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
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/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/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/Manifest b/kde-misc/akonadi-git-resource/Manifest
index b4e116315e8d..a55ae4acf5cf 100644
--- a/kde-misc/akonadi-git-resource/Manifest
+++ b/kde-misc/akonadi-git-resource/Manifest
@@ -1 +1,2 @@
-DIST akonadi-git-resource-0_p20120222.tar.xz 10256 RMD160 0cfa88853d999b608d26f22a76dd98a71ea47f06 SHA1 60827c0e3b7db40397997cc187e61255df20b89b SHA256 8f531d1742675a9c9e8c5c38cb021bd80d17009798269b584db88f29151ddae0
+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
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/Manifest b/mail-client/clawsker/Manifest
index 7271b212ac88..02eb4f4b5ebb 100644
--- a/mail-client/clawsker/Manifest
+++ b/mail-client/clawsker/Manifest
@@ -1 +1,2 @@
+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
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/Manifest b/mail-client/sylpheed/Manifest
index ca03ea1aa5de..547bc351a477 100644
--- a/mail-client/sylpheed/Manifest
+++ b/mail-client/sylpheed/Manifest
@@ -1,2 +1 @@
-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
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/Manifest b/media-fonts/mplus-outline-fonts/Manifest
index 6121d597c078..3308974a1969 100644
--- a/media-fonts/mplus-outline-fonts/Manifest
+++ b/media-fonts/mplus-outline-fonts/Manifest
@@ -1,5 +1,3 @@
 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
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/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/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/Manifest b/media-libs/mesa/Manifest
index cc6958e3680e..d8e393b7ac7b 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -6,6 +6,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
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/Manifest b/media-sound/mpg123/Manifest
index b2a8080dd0af..251dd55c49e3 100644
--- a/media-sound/mpg123/Manifest
+++ b/media-sound/mpg123/Manifest
@@ -1,3 +1,4 @@
 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
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/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/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/Manifest b/media-video/handbrake/Manifest
index 81ffdcfb85e2..7a2803de6c65 100644
--- a/media-video/handbrake/Manifest
+++ b/media-video/handbrake/Manifest
@@ -1 +1,2 @@
+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
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/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.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/Manifest b/net-analyzer/etherape/Manifest
index 7d5c411f8073..06c6ea6c0134 100644
--- a/net-analyzer/etherape/Manifest
+++ b/net-analyzer/etherape/Manifest
@@ -1 +1,2 @@
 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
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/Manifest b/net-analyzer/fping/Manifest
index 0dbe26e3b855..ec6a49c5c39f 100644
--- a/net-analyzer/fping/Manifest
+++ b/net-analyzer/fping/Manifest
@@ -2,5 +2,6 @@ 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
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/Manifest b/net-analyzer/munin/Manifest
index 9c3f8684feef..d4ec4c239f6b 100644
--- a/net-analyzer/munin/Manifest
+++ b/net-analyzer/munin/Manifest
@@ -1,6 +1,6 @@
 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
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/Manifest b/net-analyzer/wireshark/Manifest
index f4fe4bd0a27e..7a73a7fca4fe 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,4 +1,4 @@
-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
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/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/Manifest b/net-ftp/lftp/Manifest
index cad2db7aa318..17e3bc7b61f4 100644
--- a/net-ftp/lftp/Manifest
+++ b/net-ftp/lftp/Manifest
@@ -1,2 +1,3 @@
 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
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/Manifest b/net-im/skype/Manifest
index 41d079966c18..7389ed464be5 100644
--- a/net-im/skype/Manifest
+++ b/net-im/skype/Manifest
@@ -1,5 +1,6 @@
 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
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/Manifest b/net-irc/weechat/Manifest
index 91f3c829ff6d..dd9ab95a4515 100644
--- a/net-irc/weechat/Manifest
+++ b/net-irc/weechat/Manifest
@@ -1 +1,2 @@
 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
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/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/Manifest b/net-libs/libkgapi/Manifest
index c051368b2369..e3a63e8904d4 100644
--- a/net-libs/libkgapi/Manifest
+++ b/net-libs/libkgapi/Manifest
@@ -1 +1,2 @@
 DIST libkgapi-0.4.4.tar.bz2 50992 SHA256 2decce55e5872dc3f5de6b227bb03de8649d0890f6754126595e4b1a93548bb1 SHA512 f11a67f148e9e3b64ac01a61e4b43a21858faeea57cc263a713e73c74bea0ef5fce75984dcee845d0da19eb019275569aa161d83ffb465f6039638ccabd7db1d WHIRLPOOL 968cee0b6c9f17b7ec6d4ced65dbaf738bde37f9eab5c5434f7002efefc7d887dc0906af1fd472a678fdccb7571a5201e8175741c46a2c178d7c0e22a00c2e6d
+DIST libkgapi-2.0.0.tar.bz2 112492 SHA256 ea3fe10553b965f66bbccae7aa2b5c0ee4536a309b65c9c738b536bc0770d451 SHA512 b3ade1c42c78e89f0968892a0df804a1c9c401d5cf6012d56036364dfb36d93285b0089b445da223af704c493fb663b8d65efb5e93579f69f2df2ca4c706b0dc WHIRLPOOL 9a258e87d95343195875890dfff6f085a38d4f7d7e6d1163f12a9f62afc5acb179457d6eb60f2011764e019e7c5e9b9d40069bd19a4743182a3410094c989c9d
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/Manifest b/net-mail/libpst/Manifest
index a875ad0004e8..e779d86a8c6c 100644
--- a/net-mail/libpst/Manifest
+++ b/net-mail/libpst/Manifest
@@ -1,2 +1,3 @@
 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
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/Manifest b/net-misc/apt-cacher-ng/Manifest
index 27b8f52e5c62..4afbcf0bd3c7 100644
--- a/net-misc/apt-cacher-ng/Manifest
+++ b/net-misc/apt-cacher-ng/Manifest
@@ -1,2 +1,3 @@
 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
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/Manifest b/net-misc/rabbitmq-server/Manifest
index fc8ba8eea10f..a5209c4277cb 100644
--- a/net-misc/rabbitmq-server/Manifest
+++ b/net-misc/rabbitmq-server/Manifest
@@ -1,5 +1,4 @@
 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
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 "> $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/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/Manifest b/sys-apps/hwids/Manifest
index 5cfb7aca530a..311533392956 100644
--- a/sys-apps/hwids/Manifest
+++ b/sys-apps/hwids/Manifest
@@ -1,3 +1,4 @@
 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
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="! \
+			"${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/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/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/Manifest b/x11-wm/goomwwm/Manifest
new file mode 100644
index 000000000000..488ee85f6618
--- /dev/null
+++ b/x11-wm/goomwwm/Manifest
@@ -0,0 +1 @@
+DIST goomwwm-1.0.0.tar.gz 69967 SHA256 2c65c9002e8254bc51f86c8bdf8b1a04f24c2c6006bbe6244cc85e9e8b9679ae SHA512 a2d486e7b97ef3dd0c6eb0702a21e51853ed1456aee7c1d11c90561a62218a4970a61ebb9ba7551428d72035066d7be445a952083baf9c53957e351ad8f4b5de WHIRLPOOL 6b86018714f4752e3250d8bc495290142d723fbfaaf0e36a426f84f5c31ca2aab38409f84e543d5844c121265ce49137c01d5263d8090eb398d0ddb9564c5e4a
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
+
+
+