2017-06-03 15:22:24 UTC

15 files changed, 45 insertions, 122 deletions

diff --git a/metadata/md5-cache/app-emulation/libvirt-2.5.0-r2 b/metadata/md5-cache/app-emulation/libvirt-2.5.0-r2
deleted file mode 100644
index e6f63953afa6..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-2.5.0-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=6
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs elibc_glibc
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/2.5.0
-SRC_URI=http://libvirt.org/sources/libvirt-2.5.0.tar.xz
-_eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_test:- src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=5a2f0e627b7617a9fc13fc9628702ee5
diff --git a/metadata/md5-cache/app-emulation/libvirt-3.1.0 b/metadata/md5-cache/app-emulation/libvirt-3.1.0
deleted file mode 100644
index 3d4b9ed9a33d..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs ) app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath virtual/pkgconfig >=app-portage/elt-patches-20170317 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=6
-HOMEPAGE=http://www.libvirt.org/
-IUSE=apparmor audit +caps +dbus firewalld fuse glusterfs iscsi +libvirtd lvm libssh lxc +macvtap nfs nls numa openvz parted pcap phyp policykit +qemu rbd sasl selinux +udev uml +vepa virtualbox virt-network wireshark-plugins xen zeroconf zfs elibc_glibc
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2.1
-RDEPEND=app-misc/scrub dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 || ( >=net-analyzer/netcat6-1.0-r2 >=net-analyzer/openbsd-netcat-1.105-r1 ) >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 >=net-misc/curl-7.18.0 sys-apps/dmidecode >=sys-apps/util-linux-2.17 sys-devel/gettext sys-libs/ncurses:0= sys-libs/readline:= apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dbus? ( sys-apps/dbus ) elibc_glibc? ( sys-libs/glibc[rpc(+)] ) firewalld? ( net-firewall/firewalld ) fuse? ( >=sys-fs/fuse-2.8.6 ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-0.13.0 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6] net-misc/radvd sys-apps/iproute2[-minimal] ) virtualbox? ( || ( app-emulation/virtualbox >=app-emulation/virtualbox-bin-2.2.0 ) ) wireshark-plugins? ( net-analyzer/wireshark:= ) xen? ( app-emulation/xen app-emulation/xen-tools:= ) udev? ( virtual/udev >=x11-libs/libpciaccess-0.10.9 ) zeroconf? ( >=net-dns/avahi-0.6[dbus] ) zfs? ( sys-fs/zfs )
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu uml virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) policykit? ( dbus ) qemu? ( libvirtd ) uml? ( libvirtd ) vepa? ( macvtap ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/3.1.0
-SRC_URI=http://libvirt.org/sources/libvirt-3.1.0.tar.xz
-_eclass_exported_funcs=pkg_preinst:- pkg_postinst:- pkg_setup:- src_prepare:- src_configure:- src_test:- src_install:-
-_eclasses_=autotools	7027963e8e8cc12c91117bdb9225dc26	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	libtool	e32ea84bf82cf8987965b574672dba93	linux-info	ca370deef9d44125d829f2eb6ebc83e0	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	systemd	ec2e9154031d942186c75c0aabb41900	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	user	e4b567c44272a719fabf53f0f885d3f7	versionator	c80ccf29e90adea7c5cae94b42eb76d0
-_md5_=098de0057263e84d7569c9e5a343dfc8
diff --git a/metadata/md5-cache/dev-ml/ocaml-dns-0.20.0 b/metadata/md5-cache/dev-ml/ocaml-dns-0.20.0
deleted file mode 100644
index ff9c099ce898..000000000000
--- a/metadata/md5-cache/dev-ml/ocaml-dns-0.20.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=test? ( dev-ml/ounit dev-ml/ocaml-pcap ) dev-ml/topkg dev-ml/ppx_tools async? ( dev-ml/async:= ) lwt? ( >=dev-ml/lwt-3:= dev-ml/ocaml-cstruct:=[lwt(-)] ) >=dev-lang/ocaml-4:= dev-ml/cmdliner:= dev-ml/mirage-profile:= >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-1.9.0:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/ocaml-hashcons:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?] !<dev-ml/mirage-types-1.2.0 !dev-ml/odns >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=A pure OCaml implementation of the DNS protocol
-EAPI=5
-HOMEPAGE=https://github.com/mirage/ocaml-dns https://mirage.io
-IUSE=async +lwt +ocamlopt test
-KEYWORDS=~amd64
-LICENSE=LGPL-2 LGPL-2.1-with-linking-exception ISC
-RDEPEND=async? ( dev-ml/async:= ) lwt? ( >=dev-ml/lwt-3:= dev-ml/ocaml-cstruct:=[lwt(-)] ) >=dev-lang/ocaml-4:= dev-ml/cmdliner:= dev-ml/mirage-profile:= >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-1.9.0:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/ocaml-hashcons:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?] !<dev-ml/mirage-types-1.2.0 !dev-ml/odns
-RESTRICT=test
-SLOT=0/0.20.0
-SRC_URI=https://github.com/mirage/ocaml-dns/archive/v0.20.0.tar.gz -> ocaml-dns-0.20.0.tar.gz
-_eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=73ad083afb01077bd197a3a365097afd
diff --git a/metadata/md5-cache/dev-ml/ocaml-dns-0.20.1 b/metadata/md5-cache/dev-ml/ocaml-dns-0.20.1
index 9aef2897e410..2036ecc45b1a 100644
--- a/metadata/md5-cache/dev-ml/ocaml-dns-0.20.1
+++ b/metadata/md5-cache/dev-ml/ocaml-dns-0.20.1
@@ -1,4 +1,4 @@
-DEFINED_PHASES=compile install
+DEFINED_PHASES=compile install prepare
 DEPEND=test? ( dev-ml/ounit dev-ml/ocaml-pcap ) dev-ml/topkg dev-ml/ppx_tools async? ( dev-ml/async:= ) lwt? ( >=dev-ml/lwt-3:= dev-ml/ocaml-cstruct:=[lwt(-)] ) >=dev-lang/ocaml-4:= dev-ml/cmdliner:= dev-ml/mirage-profile:= >=dev-ml/ocaml-base64-2.0.0:= >=dev-ml/ocaml-cstruct-1.9.0:= >=dev-ml/ocaml-ipaddr-2.6.0:= dev-ml/ocaml-re:= >=dev-ml/ocaml-uri-1.7.0:= dev-ml/ocaml-hashcons:=[ocamlopt?] dev-lang/ocaml:=[ocamlopt?] !<dev-ml/mirage-types-1.2.0 !dev-ml/odns >=dev-ml/findlib-1.0.4-r1
 DESCRIPTION=A pure OCaml implementation of the DNS protocol
 EAPI=5
@@ -10,6 +10,6 @@ RDEPEND=async? ( dev-ml/async:= ) lwt? ( >=dev-ml/lwt-3:= dev-ml/ocaml-cstruct:=
 RESTRICT=test
 SLOT=0/0.20.1
 SRC_URI=https://github.com/mirage/ocaml-dns/archive/0.20.1.tar.gz -> ocaml-dns-0.20.1.tar.gz
-_eclass_exported_funcs=src_compile:- src_install:-
+_eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=30c4d2f07412c32447d6a5d5f11d026f
+_md5_=a7a4ada8d676abc2e54204a476d7d3f1
diff --git a/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4 b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
new file mode 100644
index 000000000000..2b1bb54bccaa
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/ocaml-uri-1.9.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/stringext:= dev-ml/type-conv:= dev-lang/ocaml:= test? ( >=dev-ml/ounit-1.0.2 ) dev-ml/jbuilder dev-ml/opam >=dev-ml/findlib-1.0.4-r1
+DESCRIPTION=RFC3986 URI parsing library for OCaml
+EAPI=5
+HOMEPAGE=https://github.com/mirage/ocaml-uri https://mirage.io
+IUSE=test
+KEYWORDS=~amd64
+LICENSE=ISC
+RDEPEND=dev-ml/ocaml-re:= dev-ml/sexplib:= dev-ml/ppx_sexp_conv:= dev-ml/stringext:= dev-ml/type-conv:= dev-lang/ocaml:=
+SLOT=0/1.9.4
+SRC_URI=https://github.com/mirage/ocaml-uri/archive/v1.9.4.tar.gz -> ocaml-uri-1.9.4.tar.gz
+_eclass_exported_funcs=src_install:-
+_eclasses_=findlib	45d6030075064a68da8d7143726a1150
+_md5_=2893a7890f0fcfb73546b2c9da95ab06
diff --git a/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0 b/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
index 51d174712a65..8edb484c2789 100644
--- a/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
+++ b/metadata/md5-cache/dev-ml/ocaml-webmachine-0.4.0
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt?] test? ( dev-ml/ounit[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
+DEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] test? ( dev-ml/ounit[ocamlopt?] ) >=dev-ml/findlib-1.0.4-r1 >=dev-lang/ocaml-3.12:=[ocamlopt?] dev-ml/ocamlbuild
 DESCRIPTION=A REST toolkit for OCaml
 EAPI=5
 HOMEPAGE=https://github.com/inhabitedtype/ocaml-webmachine
 IUSE=+ocamlopt debug doc test
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
+RDEPEND=dev-ml/calendar:= dev-ml/ocaml-cohttp:=[ocamlopt?] dev-ml/ocaml-dispatch:=[ocamlopt?] dev-ml/ocaml-re:=[ocamlopt?] dev-ml/ocaml-uri:=[ocamlopt(+)?] >=dev-lang/ocaml-3.12:=[ocamlopt?]
 SLOT=0/0.4.0
 SRC_URI=https://github.com/inhabitedtype/ocaml-webmachine/archive/0.4.0.tar.gz -> ocaml-webmachine-0.4.0.tar.gz
 _eclass_exported_funcs=src_unpack:base src_prepare:base src_configure:oasis src_compile:oasis src_test:oasis src_install:oasis
 _eclasses_=base	df2aa567b3f0595aae0d0923889f7631	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	oasis	9256ed89af74c3365ec888c00bfdfe43	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=f0d962bde2f79c3af094c477c0e87174
+_md5_=488dafefb8249a901254d02ee6926a79
diff --git a/metadata/md5-cache/dev-ml/reason-1.13.5 b/metadata/md5-cache/dev-ml/reason-2.0.0
index 3f6b2b4734dd..d2c9f1215f6d 100644
--- a/metadata/md5-cache/dev-ml/reason-1.13.5
+++ b/metadata/md5-cache/dev-ml/reason-2.0.0
@@ -7,7 +7,7 @@ IUSE=+ocamlopt
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/reason-parser:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/utop:=
-SLOT=0/1.13.5
-SRC_URI=https://github.com/facebook/reason/archive/1.13.5.tar.gz -> reason-1.13.5.tar.gz
+SLOT=0/2.0.0
+SRC_URI=https://github.com/facebook/reason/archive/2.0.0.tar.gz -> reason-2.0.0.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
-_md5_=eb725d64f0efbf18d2ba5402a7c62de9
+_md5_=cdd764a8fa9db1d95a3fa369bf7b7509
diff --git a/metadata/md5-cache/dev-ml/reason-parser-1.13.3 b/metadata/md5-cache/dev-ml/reason-parser-1.13.3
deleted file mode 100644
index be2712512642..000000000000
--- a/metadata/md5-cache/dev-ml/reason-parser-1.13.3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= dev-ml/ocamlbuild dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Meta Language Toolchain
-EAPI=6
-HOMEPAGE=https://github.com/facebook/reason
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] dev-ml/menhir:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:=
-SLOT=0/1.13.3
-SRC_URI=https://github.com/facebook/reason/archive/1.13.3.tar.gz -> reason-parser-1.13.3.tar.gz
-_eclass_exported_funcs=src_compile:- src_install:-
-_eclasses_=findlib	45d6030075064a68da8d7143726a1150
-_md5_=a7783f1c459f4db4587de03a234c5155
diff --git a/metadata/md5-cache/dev-ml/reason-parser-1.13.4 b/metadata/md5-cache/dev-ml/reason-parser-1.13.4
deleted file mode 100644
index 32c1de69ee78..000000000000
--- a/metadata/md5-cache/dev-ml/reason-parser-1.13.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/menhir-20170418:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:= dev-ml/ocamlbuild dev-ml/opam >=dev-ml/findlib-1.0.4-r1
-DESCRIPTION=Meta Language Toolchain
-EAPI=6
-HOMEPAGE=https://github.com/facebook/reason
-IUSE=+ocamlopt
-KEYWORDS=~amd64
-LICENSE=BSD
-RDEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/menhir-20170418:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:=
-SLOT=0/1.13.4
-SRC_URI=https://github.com/facebook/reason/archive/1.13.4.tar.gz -> reason-parser-1.13.4.tar.gz
-_eclass_exported_funcs=src_prepare:- src_compile:- src_install:-
-_eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
-_md5_=fd0c76d155c3fa0fe84da069f81707bc
diff --git a/metadata/md5-cache/dev-ml/reason-parser-1.13.5 b/metadata/md5-cache/dev-ml/reason-parser-2.0.0
index abe5212cbb9d..1042c13a9785 100644
--- a/metadata/md5-cache/dev-ml/reason-parser-1.13.5
+++ b/metadata/md5-cache/dev-ml/reason-parser-2.0.0
@@ -7,8 +7,8 @@ IUSE=+ocamlopt
 KEYWORDS=~amd64
 LICENSE=BSD
 RDEPEND=dev-lang/ocaml:=[ocamlopt?] >=dev-ml/menhir-20170418:= dev-ml/merlin-extend:= dev-ml/result:= dev-ml/topkg:= dev-ml/ocaml-migrate-parsetree:= dev-ml/ppx_tools_versioned:=
-SLOT=0/1.13.5
-SRC_URI=https://github.com/facebook/reason/releases/download/1.13.5/reason-parser-1.13.5.tar.gz
+SLOT=0/2.0.0
+SRC_URI=https://github.com/facebook/reason/releases/download/2.0.0/reason-parser-2.0.0.tar.gz
 _eclass_exported_funcs=src_compile:- src_install:-
 _eclasses_=epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	9c113d6a64826c40154cad7be15d95ea	findlib	45d6030075064a68da8d7143726a1150	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee
 _md5_=f254adc8879e6b7722777c1776fad619
diff --git a/metadata/md5-cache/dev-python/libvirt-python-2.5.0-r1 b/metadata/md5-cache/dev-python/libvirt-python-2.5.0-r1
deleted file mode 100644
index 2ddee8380643..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-2.5.0-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-emulation/libvirt:0/2.5.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=libvirt Python bindings
-EAPI=6
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/2.5.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://libvirt.org/sources/python/libvirt-python-2.5.0.tar.gz
-_eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=4c4583ccc58da44adc14c4ed9e17805e
diff --git a/metadata/md5-cache/dev-python/libvirt-python-3.1.0 b/metadata/md5-cache/dev-python/libvirt-python-3.1.0
deleted file mode 100644
index 611f1f4ffb92..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-3.1.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-emulation/libvirt:0/3.1.0 virtual/pkgconfig test? ( dev-python/lxml[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=libvirt Python bindings
-EAPI=6
-HOMEPAGE=https://www.libvirt.org
-IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=amd64 x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/3.1.0 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=http://libvirt.org/sources/python/libvirt-python-3.1.0.tar.gz
-_eclass_exported_funcs=src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
-_eclasses_=distutils-r1	372bbe39047c0a2550319a3a82f3e063	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	284a473719153462f3e974d86c8cb81c	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	6eb35f81556258a4bc9182ad3dfd58ee	xdg-utils	b9389dfad0ee8f8e0b2a41b79fcf7120
-_md5_=0db390e1ef4d703d7e9e66216cca716b
diff --git a/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.4 b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.4
new file mode 100644
index 000000000000..f37810d1fd08
--- /dev/null
+++ b/metadata/md5-cache/x11-plugins/pidgin-skypeweb-1.4
@@ -0,0 +1,12 @@
+DEFINED_PHASES=postinst
+DEPEND=net-im/pidgin dev-libs/json-glib virtual/pkgconfig
+DESCRIPTION=SkypeWeb Plugin for Pidgin
+EAPI=6
+HOMEPAGE=https://github.com/EionRobb/skype4pidgin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=net-im/pidgin dev-libs/json-glib
+SLOT=0
+SRC_URI=https://github.com/EionRobb/skype4pidgin/archive/1.4.tar.gz -> pidgin-skypeweb-1.4.tar.gz
+_eclass_exported_funcs=pkg_postinst:-
+_md5_=2848ebc29ec107f313693d88b3dc9b40
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f0a884442cde..b5d4bab0bbc3 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1330,7 +1330,7 @@ app-emulation/libdsk 1.5.4: LIBDSK is a library for accessing discs and disc ima
 app-emulation/libguestfs 1.28.5-r2: Tools for accessing, inspect and modifying virtual machine (VM) disk images
 app-emulation/libguestfs-appliance 1.26.0-r1 1.28.1 1.28.1-r1: VM appliance disk image used in libguestfs package
 app-emulation/libspectrum 1.0.0 1.1.1: Spectrum emulation library
-app-emulation/libvirt 2.5.0-r2 3.1.0 3.2.0 3.3.0 9999: C toolkit to manipulate virtual machines
+app-emulation/libvirt 3.2.0 3.3.0 9999: C toolkit to manipulate virtual machines
 app-emulation/libvirt-glib 1.0.0 1.0.0-r1: GLib and GObject mappings for libvirt
 app-emulation/libvirt-snmp 0.0.2-r2 0.0.3: Provides SNMP functionality for libvirt
 app-emulation/lxc 1.0.8 2.0.3-r1 2.0.4 2.0.5 2.0.6-r1 2.0.7: LinuX Containers userspace utilities
@@ -5311,7 +5311,7 @@ dev-ml/ocaml-cstruct 2.4.0 2.4.1: Map OCaml arrays onto C-like structs
 dev-ml/ocaml-ctypes 0.4.1-r1 0.11.2 0.11.3 0.11.3-r1 0.11.4 0.12.0: Library for binding to C libraries using pure OCaml
 dev-ml/ocaml-data-notation 0.0.11-r1: This project uses type-conv to dump OCaml data structure using OCaml data notation
 dev-ml/ocaml-dispatch 0.3.0: Path-based dispatching for client- and server-side applications
-dev-ml/ocaml-dns 0.20.0 0.20.1: A pure OCaml implementation of the DNS protocol
+dev-ml/ocaml-dns 0.20.1: A pure OCaml implementation of the DNS protocol
 dev-ml/ocaml-doc 4.04: Ocaml reference manual (html)
 dev-ml/ocaml-expat 1.0.0: OCaml bindings for expat
 dev-ml/ocaml-expect 0.0.5: Ocaml implementation of expect to help building unitary testing
@@ -5337,7 +5337,7 @@ dev-ml/ocaml-ssl 0.5.3: OCaml bindings for OpenSSL
 dev-ml/ocaml-stdint 0.3.0: Various signed and unsigned integers for OCaml
 dev-ml/ocaml-text 0.8: Library for dealing with 'text'
 dev-ml/ocaml-uint 1.2.0: Unsigned ints for OCaml
-dev-ml/ocaml-uri 1.9.2: RFC3986 URI parsing library for OCaml
+dev-ml/ocaml-uri 1.9.2 1.9.4: RFC3986 URI parsing library for OCaml
 dev-ml/ocaml-webmachine 0.4.0: A REST toolkit for OCaml
 dev-ml/ocaml-websocket 2.9: Websocket library for OCaml
 dev-ml/ocamlbuild 0.10.1 0.11.0: Generic build tool with built-in rules for building OCaml library and programs
@@ -5412,8 +5412,8 @@ dev-ml/qcheck 0.5.2 0.5.3 0.5.3.1 0.6: QuickCheck inspired property-based testin
 dev-ml/re2 0.9.0: OCaml bindings for RE2
 dev-ml/react 0.9.4 1.2.0 1.2.1: OCaml module for functional reactive programming
 dev-ml/reactiveData 0.2.1 9999: Functional reactive programming with incremental changes in data structures
-dev-ml/reason 1.13.5: Meta Language Toolchain
-dev-ml/reason-parser 1.13.3 1.13.4 1.13.5: Meta Language Toolchain
+dev-ml/reason 2.0.0: Meta Language Toolchain
+dev-ml/reason-parser 2.0.0: Meta Language Toolchain
 dev-ml/res 4.0.7: Resizable Array and Buffer modules for O'Caml
 dev-ml/result 1.2: Compat result type
 dev-ml/sedlex 1.99.3: An OCaml lexer generator for Unicode
@@ -7900,7 +7900,7 @@ dev-python/libnatpmp 20130911 20140401-r1 20150609: Python module for libnatpmp,
 dev-python/libpillowfight 0.2.1: Small library containing various image processing algorithms
 dev-python/librharris 0.1.14-r1: Python Internet Programming Library
 dev-python/librsvg-python 2.32.0-r1: Python bindings for the librsvg library
-dev-python/libvirt-python 2.5.0-r1 3.1.0 3.2.0 3.3.0 9999: libvirt Python bindings
+dev-python/libvirt-python 3.2.0 3.3.0 9999: libvirt Python bindings
 dev-python/libwnck-python 2.32.0-r1: Python bindings for the libwnck library
 dev-python/libzilla 1.3: Library for managing Bugzilla bug reports from the CLI
 dev-python/line_profiler 1.0 1.0-r1 2.0 9999: Line-by-line profiler
@@ -19189,7 +19189,7 @@ x11-plugins/pidgin-otr 4.0.2: (OTR) Messaging allows you to have private convers
 x11-plugins/pidgin-privacy-please 0.7.1: pidgin plugin to stop spammers from annoying you
 x11-plugins/pidgin-rhythmbox 2.0: automatically update your pidgin profile with current info from Rhythmbox
 x11-plugins/pidgin-sipe 1.18.0-r1 1.20.1 1.21.1 1.22.0: Pidgin Plug-in SIPE (Sip Exchange Protocol)
-x11-plugins/pidgin-skypeweb 1.1 1.2 1.2.2 9999: SkypeWeb Plugin for Pidgin
+x11-plugins/pidgin-skypeweb 1.1 1.2 1.2.2 1.4 9999: SkypeWeb Plugin for Pidgin
 x11-plugins/pidgin-window_merge 0.3: A Pidgin plugin that merges the Buddy List window with a conversation window
 x11-plugins/pidgin-xmpp-receipts 0.6: Implementation of xmpp message delivery receipts (XEP-0184) for Pidgin
 x11-plugins/pidgintex 1.1.2_p20170107: Pidgin plugin to render LaTeX expressions in messages
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index d530c029611a..2ae0938d5de1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 03 Jun 2017 15:03:41 +0000
+Sat, 03 Jun 2017 15:22:25 +0000