2016-07-08 18:02:42 UTC

19 files changed, 207 insertions, 49 deletions

diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.9 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.9
deleted file mode 100644
index 88b458b318f0..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.9
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/portage python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/tools/index.xml
-IUSE=python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-apps/portage !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/grep python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gentoolkit-0.3.0.9.tar.gz
-_eclass_exported_funcs=pkg_postinst:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=55542376ec0279ab66e174ef886ce2cc
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.9-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.3.0.9-r1
deleted file mode 100644
index edbfdfe18b2e..000000000000
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.0.9-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] python_targets_pypy? ( virtual/pypy:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=5
-HOMEPAGE=https://www.gentoo.org/proj/en/portage/tools/index.xml
-IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)] !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/gentoo-functions sys-apps/grep python_targets_pypy? ( virtual/pypy:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 )
-SLOT=0
-SRC_URI=mirror://gentoo/gentoolkit-0.3.0.9.tar.gz
-_eclass_exported_funcs=pkg_postinst:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
-_eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=eea59742317aeb5c1dc9b01ae1ae501c
diff --git a/metadata/md5-cache/app-portage/gentoolkit-0.3.1-r1 b/metadata/md5-cache/app-portage/gentoolkit-0.3.2
index 6bf34dcffe7f..5a7c27faddc7 100644
--- a/metadata/md5-cache/app-portage/gentoolkit-0.3.1-r1
+++ b/metadata/md5-cache/app-portage/gentoolkit-0.3.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 DESCRIPTION=Collection of administration scripts for Gentoo
-EAPI=5
+EAPI=6
 HOMEPAGE=https://www.gentoo.org/proj/en/portage/tools/index.xml
 IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~x86-fbsd ~x64-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
@@ -9,7 +9,7 @@ LICENSE=GPL-2
 RDEPEND=sys-apps/portage[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] !<=app-portage/gentoolkit-dev-0.2.7 || ( >=sys-apps/coreutils-8.15 app-misc/realpath sys-freebsd/freebsd-bin ) sys-apps/gawk sys-apps/gentoo-functions sys-apps/grep python_targets_pypy? ( virtual/pypy:0=[xml(+),threads(+)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[xml(+),threads(+)] ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3[xml(+),threads(+)] ) python_targets_python3_4? ( dev-lang/python:3.4[xml(+),threads(+)] ) python_targets_python3_5? ( dev-lang/python:3.5[xml(+),threads(+)] ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
 REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 python_targets_python3_5 )
 SLOT=0
-SRC_URI=http://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.3.1.tar.gz
+SRC_URI=http://dev.gentoo.org/~dolsen/releases/gentoolkit/gentoolkit-0.3.2.tar.gz
 _eclass_exported_funcs=pkg_postinst:- src_prepare:distutils-r1 src_configure:distutils-r1 src_compile:distutils-r1 src_test:distutils-r1 src_install:distutils-r1
 _eclasses_=distutils-r1	674dae153419b2200ae54e879cc65b57	eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=dbcfdf2363c7f12481722de48e9e3b18
+_md5_=7962658c06b6ff454dae31b40e33f73f
diff --git a/metadata/md5-cache/dev-lang/srf-1.0-r2 b/metadata/md5-cache/dev-lang/srf-1.0-r2
new file mode 100644
index 000000000000..fb09f964c738
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/srf-1.0-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=install prepare
+DEPEND=sys-devel/flex virtual/yacc
+DESCRIPTION=The Simple Recursive Functions programming language
+EAPI=6
+HOMEPAGE=http://www.stratigery.com/srf.html
+KEYWORDS=~x86 ~x86-linux ~ppc-macos ~amd64
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.stratigery.com/srf.html/srf-1.0.tar.gz
+_eclass_exported_funcs=src_prepare:- src_install:-
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=db4ea11f9f040990e57de002aa6f03b6
diff --git a/metadata/md5-cache/dev-lang/ucblogo-6.0-r1 b/metadata/md5-cache/dev-lang/ucblogo-6.0-r1
new file mode 100644
index 000000000000..7d7276d96293
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/ucblogo-6.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure prepare
+DEPEND=app-text/texi2html dev-libs/libbsd virtual/tex-base virtual/texi2dvi X? ( x11-libs/wxGTK:2.8[X] )
+DESCRIPTION=a reflective, functional programming language
+EAPI=6
+HOMEPAGE=https://www.cs.berkeley.edu/~bh/logo.html
+IUSE=X
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://ftp.cs.berkeley.edu/pub/ucblogo/ucblogo-6.0.tar.gz
+_eclass_exported_funcs=src_prepare:- src_configure:- src_compile:-
+_eclasses_=elisp-common	9f56c4e9bf1282dbfc2a5a09e1124e74	eutils	792f83d5ec9536cb5ccef375469d8bde	flag-o-matic	8632fcd33a047954f007dee9a137bdcc	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	wxwidgets	9b34ce3ca77f4e418e8fd9951c4c1cb1
+_md5_=62df1459d91deb7bf790501c6bac2b78
diff --git a/metadata/md5-cache/dev-libs/libkpass-6-r1 b/metadata/md5-cache/dev-libs/libkpass-6-r1
new file mode 100644
index 000000000000..19a69f9f8604
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libkpass-6-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure install
+DEPEND=>=dev-libs/nettle-2.7.1
+DESCRIPTION=Libkpass is a from-scratch C implementation for accessing KeePass 1.x databases
+EAPI=6
+HOMEPAGE=http://libkpass.sourceforge.net/
+IUSE=static-libs
+KEYWORDS=~amd64
+LICENSE=GPL-2
+RDEPEND=>=dev-libs/nettle-2.7.1
+SLOT=0
+SRC_URI=mirror://sourceforge/libkpass/libkpass-6.tar.gz
+_eclass_exported_funcs=src_configure:- src_install:-
+_md5_=0b35fcfe18dacf8f8213ae4ee5e27941
diff --git a/metadata/md5-cache/dev-libs/libntru-0.4.1-r1 b/metadata/md5-cache/dev-libs/libntru-0.4.1-r1
new file mode 100644
index 000000000000..2d15e95fa450
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libntru-0.4.1-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-lang/perl
+DESCRIPTION=C Implementation of NTRUEncrypt
+EAPI=6
+HOMEPAGE=https://github.com/tbuktu/libntru
+IUSE=examples static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+SLOT=0
+SRC_URI=https://github.com/tbuktu/libntru/archive/0.4.1.tar.gz -> libntru-0.4.1.tar.gz
+_eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:- src_install:multilib-minimal
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=d36f351aa89091e74cf84821dcea05a4
diff --git a/metadata/md5-cache/dev-libs/libuv-1.9.1-r1 b/metadata/md5-cache/dev-libs/libuv-1.9.1-r1
new file mode 100644
index 000000000000..73ee924fdb9e
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libuv-1.9.1-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/libtool virtual/pkgconfig[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !<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
+DESCRIPTION=Cross-platform asychronous I/O
+EAPI=6
+HOMEPAGE=https://github.com/libuv/libuv
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos
+LICENSE=BSD BSD-2 ISC MIT
+RESTRICT=test
+SLOT=0/1
+SRC_URI=https://github.com/libuv/libuv/archive/v1.9.1.tar.gz -> libuv-1.9.1.tar.gz
+_eclass_exported_funcs=src_prepare:- src_configure:multilib-minimal src_compile:multilib-minimal src_test:multilib-minimal src_install:multilib-minimal
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multilib-build	8fe2e81aeb36cdf8a6cc5f50443879cc	multilib-minimal	0224dee31c0f98405d572e14ad6dee65	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=75076b6dd1d3965c130bb65b51679a42
diff --git a/metadata/md5-cache/dev-libs/libxdiff-0.23-r2 b/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
new file mode 100644
index 000000000000..7baa9bafa370
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxdiff-0.23-r2
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=!<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
+DESCRIPTION=Library for creating diff files
+EAPI=6
+HOMEPAGE=http://www.xmailserver.org/xdiff-lib.html
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+SLOT=0
+SRC_URI=http://www.xmailserver.org/libxdiff-0.23.tar.gz
+_eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=336bf2799a62989e02f357f8269b228a
diff --git a/metadata/md5-cache/dev-libs/libxr-1.0-r1 b/metadata/md5-cache/dev-libs/libxr-1.0-r1
new file mode 100644
index 000000000000..7813eca2d7f1
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/libxr-1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=configure
+DEPEND=>=dev-libs/glib-2.12 >=dev-libs/libxml2-2.6.20 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) dev-util/re2c virtual/pkgconfig
+DESCRIPTION=Cross-platform XML-RPC client/server library written in C
+EAPI=6
+HOMEPAGE=http://oss.zonio.net/libxr.htm
+IUSE=libressl
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86
+LICENSE=LGPL-2
+RDEPEND=>=dev-libs/glib-2.12 >=dev-libs/libxml2-2.6.20 !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= )
+SLOT=0
+SRC_URI=http://oss.zonio.net/releases/libxr/libxr-1.0.tar.bz2
+_eclass_exported_funcs=src_configure:-
+_md5_=b79b744d1679565785a7e16cf943c348
diff --git a/metadata/md5-cache/dev-libs/mozldap-6.0.7-r1 b/metadata/md5-cache/dev-libs/mozldap-6.0.7-r1
new file mode 100644
index 000000000000..85daa5247aaf
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/mozldap-6.0.7-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl ) virtual/pkgconfig !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4
+DESCRIPTION=Mozilla LDAP C SDK
+EAPI=6
+HOMEPAGE=http://wiki.mozilla.org/LDAP_C_SDK
+IUSE=ipv6 debug +sasl
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-1.1 GPL-2 LGPL-2.1
+RDEPEND=>=dev-libs/nss-3.11.4 >=dev-libs/nspr-4.0.1 >=dev-libs/svrcore-4.0.0 sasl? ( dev-libs/cyrus-sasl )
+SLOT=0
+SRC_URI=ftp://ftp.mozilla.org/pub/mozilla.org/directory/c-sdk/releases/v6.0.7/src/mozldap-6.0.7.tar.gz
+_eclass_exported_funcs=src_prepare:- src_configure:- src_install:-
+_eclasses_=autotools	07e71b3b5690738ef7e8bc097077e00c	eutils	792f83d5ec9536cb5ccef375469d8bde	libtool	4890219c51da247200223277f993e054	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	versionator	99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=74c8c07810d17280efaf98835f0a017b
diff --git a/metadata/md5-cache/dev-python/edpwd-0.0.7-r1 b/metadata/md5-cache/dev-python/edpwd-0.0.7-r1
new file mode 100644
index 000000000000..56ed39a9852b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/edpwd-0.0.7-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/setuptools-0.6.30[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+DESCRIPTION=Encrypt/Decrypt Password Library that wraps up Blowfish
+EAPI=6
+HOMEPAGE=https://pypi.python.org/pypi/edpwd/
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/pycrypto[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 )
+SLOT=0
+SRC_URI=mirror://pypi/e/edpwd/edpwd-0.0.7.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	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=15ee266266643bdd98fb9b784a8e938e
diff --git a/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1 b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
new file mode 100644
index 000000000000..6387d47e96ba
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pygame_sdl2-6.99.6-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+DESCRIPTION=Reimplementation of portions of the pygame API using SDL2
+EAPI=6
+HOMEPAGE=https://github.com/renpy/pygame_sdl2
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1 ZLIB
+RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] media-libs/libpng:0 media-libs/libsdl2[video] media-libs/sdl2-image[png,jpeg] media-libs/sdl2-mixer media-libs/sdl2-ttf virtual/jpeg:62 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=http://www.renpy.org/dl/6.99.6/pygame_sdl2-for-renpy-6.99.6.tar.bz2
+_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	674dae153419b2200ae54e879cc65b57	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	multiprocessing	e32940a7b2a9992ad217eccddb84d548	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441	xdg-utils	e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=f030b06f93dbc1f1480182403edabfda
diff --git a/metadata/md5-cache/dev-vcs/git-imerge-0.7.0-r1 b/metadata/md5-cache/dev-vcs/git-imerge-0.7.0-r1
new file mode 100644
index 000000000000..56903c1d6195
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/git-imerge-0.7.0-r1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install
+DEPEND=dev-python/docutils
+DESCRIPTION=Incremental merge for git
+EAPI=6
+HOMEPAGE=https://github.com/mhagger/git-imerge
+IUSE=python_targets_python2_7 python_targets_python3_3 python_targets_python3_4
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_3? ( >=dev-lang/python-3.3.2-r2:3.3 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_3(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_3(-),-python_single_target_python3_4(-)] dev-vcs/git
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_3 python_targets_python3_4 )
+SLOT=0
+SRC_URI=https://github.com/mhagger/git-imerge/archive/0.7.0.tar.gz -> git-imerge-0.7.0.tar.gz
+_eclass_exported_funcs=src_compile:- src_install:-
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multibuild	742139c87a9fa3766f0c2b155e5522bf	multilib	d062ae4ba2fc40a19c11de2ad89b6616	python-r1	0f6937650a475d673baa5d0c8c0b37b3	python-utils-r1	c0ed2a2f233d3af6dd556048695dc5cb	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=25244f70368e73b510a822d7a9f3ec28
diff --git a/metadata/md5-cache/dev-vcs/topgit-0.9-r1 b/metadata/md5-cache/dev-vcs/topgit-0.9-r1
new file mode 100644
index 000000000000..95eb054239b4
--- /dev/null
+++ b/metadata/md5-cache/dev-vcs/topgit-0.9-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install
+DEPEND=sys-apps/sed virtual/awk
+DESCRIPTION=A different patch queue manager
+EAPI=6
+HOMEPAGE=https://github.com/greenrd/topgit
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-vcs/git
+SLOT=0
+SRC_URI=https://github.com/greenrd/topgit/archive/topgit-0.9.tar.gz
+_eclass_exported_funcs=src_compile:- src_install:-
+_eclasses_=bash-completion-r1	acf715fa09463f043fbfdc1640f3fb85	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=848108556a45b4ca24fb370fce095803
diff --git a/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1 b/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
new file mode 100644
index 000000000000..dfabda9391d9
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/congen-1.6.2-r1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=configure install
+DEPEND=>=sci-geosciences/libtcd-2.2.3
+DESCRIPTION=Generate the speeds, equilibrium arguments, and node factors of tidal constituents
+EAPI=6
+HOMEPAGE=http://www.flaterco.com/xtide/files.html
+IUSE=static-libs
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=>=sci-geosciences/libtcd-2.2.3
+SLOT=0
+SRC_URI=ftp://ftp.flaterco.com/xtide/congen-1.6.2.tar.bz2
+_eclass_exported_funcs=src_configure:- src_install:-
+_eclasses_=eutils	792f83d5ec9536cb5ccef375469d8bde	multilib	d062ae4ba2fc40a19c11de2ad89b6616	toolchain-funcs	82165206dedb2075f9a0fb8f9b1f9441
+_md5_=f525f85101181d79fe2befa4961d9b07
diff --git a/metadata/md5-cache/sci-geosciences/tcd-utils-20120115-r1 b/metadata/md5-cache/sci-geosciences/tcd-utils-20120115-r1
new file mode 100644
index 000000000000..6303d9e4e9db
--- /dev/null
+++ b/metadata/md5-cache/sci-geosciences/tcd-utils-20120115-r1
@@ -0,0 +1,12 @@
+DEFINED_PHASES=-
+DEPEND=>=sci-geosciences/libtcd-2.2.4
+DESCRIPTION=Utilities for working with Tidal Constituent Databases
+EAPI=6
+HOMEPAGE=http://www.flaterco.com/xtide/
+KEYWORDS=~amd64 ~x86
+LICENSE=public-domain
+RDEPEND=>=sci-geosciences/libtcd-2.2.4
+SLOT=0
+SRC_URI=ftp://ftp.flaterco.com/xtide/tcd-utils-20120115.tar.bz2
+_eclass_exported_funcs=-
+_md5_=77406870aebbb762d493810701bfa700
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index df5661288953..67217524e06c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -2109,7 +2109,7 @@ app-portage/g-ctan 2011.1 2011.1-r1: Generate and install ebuilds from the TeXLi
 app-portage/g-octave 0.4.1-r4: A tool that generates and installs ebuilds for Octave-Forge
 app-portage/g-sorcery 0.1-r1 0.2 0.2.1 0.2.1-r1 9999: framework for ebuild generators
 app-portage/genlop 0.30.9-r1 0.30.10 0.30.10-r1 9999: A nice emerge.log parser
-app-portage/gentoolkit 0.3.0.8-r2 0.3.0.9 0.3.0.9-r1 0.3.0.9-r2 0.3.1-r1 0.3.1.1 9999: Collection of administration scripts for Gentoo
+app-portage/gentoolkit 0.3.0.8-r2 0.3.0.9-r2 0.3.1.1 0.3.2 9999: Collection of administration scripts for Gentoo
 app-portage/gentoolkit-dev 0.2.8.3-r1 0.3.0 9999: Collection of developer scripts for Gentoo
 app-portage/gentoopm 0.2.9 9999: A common interface to Gentoo package managers
 app-portage/getdelta 0.7.9-r2: dynamic deltup client
@@ -4459,7 +4459,7 @@ dev-lang/smlnj 110.75: Standard ML of New Jersey compiler and libraries
 dev-lang/snobol 0.99.4 0.99.44 1.1 1.4.1: Phil Budne's port of Macro SNOBOL4 in C, for modern machines
 dev-lang/spidermonkey 1.7.0-r3 1.8.5-r4 1.8.5-r5 17.0.0-r4 17.0.0-r5 24.2.0-r3: Stand-alone JavaScript C library
 dev-lang/squirrel 2.2.4-r1 2.2.4-r2: A interpreted language mainly used for games
-dev-lang/srf 1.0-r1: The Simple Recursive Functions programming language
+dev-lang/srf 1.0-r1 1.0-r2: The Simple Recursive Functions programming language
 dev-lang/swi-prolog 6.6.6 7.2.3-r1 7.3.19 7.3.20 7.3.21: free, small, and standard compliant Prolog compiler
 dev-lang/swig 1.3.40-r2 2.0.9 2.0.12 3.0.5 3.0.8 3.0.10: Simplified Wrapper and Interface Generator
 dev-lang/tcc 0.9.26-r1 0.9.26-r2 0.9.26-r3 9999: A very small C compiler for ix86/amd64
@@ -4468,7 +4468,7 @@ dev-lang/teyjus 2.0.2: Higher-order logic programming language Lambda Prolog
 dev-lang/tinycobol 0.65.9: COBOL for linux
 dev-lang/tk 8.5.17 8.5.17-r100 8.6.4-r1 8.6.5: Tk Widget Set
 dev-lang/tuprolog 2.4.0_rc5 2.7.2 2.9.0 2.9.2: tuProlog is a light-weight Prolog for Internet applications and infrastructures
-dev-lang/ucblogo 5.5 5.5-r1 6.0: a reflective, functional programming language
+dev-lang/ucblogo 5.5 5.5-r1 6.0 6.0-r1: a reflective, functional programming language
 dev-lang/vala 0.22.1 0.26.2 0.28.1 0.30.1 0.32.0 0.32.1: Compiler for the GObject type system
 dev-lang/whitespace 0.3 0.4: Whitespace, an esoteric programming language
 dev-lang/xsb 3.3.6 3.3.7 3.5.0 3.6.0: XSB is a logic programming and deductive database system
@@ -4708,7 +4708,7 @@ dev-libs/libisoburn 1.3.8 1.4.2: Creation/expansion of ISO-9660 filesystems on C
 dev-libs/libisofs 1.3.8 1.4.2: Open-source library for reading, mastering and writing optical discs
 dev-libs/libixion 0.9.0 0.9.1-r1 0.11.1 9999: General purpose formula parser & interpreter
 dev-libs/libjit 0.1.2: Libjit is a generic Just-In-Time compilation library
-dev-libs/libkpass 6: Libkpass is a from-scratch C implementation of accessing KeePass 1.x format password databases
+dev-libs/libkpass 6 6-r1: Libkpass is a from-scratch C implementation for accessing KeePass 1.x databases
 dev-libs/libksba 1.3.3 1.3.4: X.509 and CMS (PKCS#7) library
 dev-libs/liblazy 0.2: lib for D-Bus daemon messages, querying HAL or PolicyKit privileges
 dev-libs/liblinear 210-r1: A Library for Large Linear Classification
@@ -4745,7 +4745,7 @@ dev-libs/libnfc 1.4.2 1.5.0 1.5.1 1.5.1-r1 1.7.0-r1 1.7.1: Near Field Communicat
 dev-libs/libnl 1.1.4 3.2.27 3.2.28_rc1 3.2.9999: A collection of libraries providing APIs to netlink protocol based Linux kernel interfaces
 dev-libs/libnsfb 0.1.4: framebuffer abstraction library, written in C
 dev-libs/libnsutils 0.0.2: base64 and time library, written in C
-dev-libs/libntru 0.4.1: C Implementation of NTRUEncrypt
+dev-libs/libntru 0.4.1 0.4.1-r1: C Implementation of NTRUEncrypt
 dev-libs/libofx 0.9.10: A library to support the Open Financial eXchange XML format
 dev-libs/liboil 0.3.17 0.3.17-r1 0.3.17-r2: Library of simple functions that are optimized for various CPUs
 dev-libs/liboobs 3.0.0: Liboobs is a wrapping library to the System Tools Backends
@@ -4806,7 +4806,7 @@ dev-libs/libusb 1.0.9-r2 1.0.18 1.0.19-r1 1.0.20: Userspace access to USB device
 dev-libs/libusb-compat 0.1.5-r2 0.1.5-r3: Userspace access to USB devices (libusb-0.1 compat wrapper)
 dev-libs/libusbhp 1.0.2: Usb Hotplug Library
 dev-libs/libutf8proc 1.3.1 1.3.1_p2: mapping tool for UTF-8 strings
-dev-libs/libuv 1.4.2 1.8.0 1.9.1: Cross-platform asychronous I/O
+dev-libs/libuv 1.4.2 1.8.0 1.9.1 1.9.1-r1: Cross-platform asychronous I/O
 dev-libs/libverto 0.2.5 0.2.5-r1 0.2.6: Main event loop abstraction library
 dev-libs/libvformat 1.13-r1 1.13-r2: Library to read and write vcard files
 dev-libs/libvolume_id 0.81.0 0.81.1: Library to provide file system information
@@ -4818,10 +4818,10 @@ dev-libs/libwbxml 0.11.2: Library and tools to parse, encode and handle WBXML do
 dev-libs/libx86 1.1-r2 1.1-r3 1.1-r4: A hardware-independent library for executing real-mode x86 code
 dev-libs/libx86emu 1.1: A library for emulating x86
 dev-libs/libxdg-basedir 1.2.0-r1: Small library to access XDG Base Directories Specification paths
-dev-libs/libxdiff 0.23-r1: Library for creating diff files
+dev-libs/libxdiff 0.23-r1 0.23-r2: Library for creating diff files
 dev-libs/libxls 0.3.0_pre107: A library which can read Excel (xls) files
 dev-libs/libxml2 2.9.2-r4 2.9.3 2.9.4: Version 2 of the library to manipulate XML files
-dev-libs/libxr 1.0: Cross-platform XML-RPC client/server library written in C
+dev-libs/libxr 1.0 1.0-r1: Cross-platform XML-RPC client/server library written in C
 dev-libs/libxslt 1.1.28-r5 1.1.29: XSLT libraries and tools
 dev-libs/libyaml 0.1.6: YAML 1.1 parser and emitter written in C
 dev-libs/libzeitgeist 0.3.18: Client library to interact with zeitgeist
@@ -4848,7 +4848,7 @@ dev-libs/mini-xml 2.8 2.9: Small XML parsing library to read XML and XML-like da
 dev-libs/mm 1.4.2-r1: Shared Memory Abstraction Library
 dev-libs/mongo-c-driver 0.7.1-r1 0.8.1-r1 0.98.2 1.1.2-r1 1.1.10 1.3.5: A high-performance MongoDB driver for C
 dev-libs/mongo-cxx-driver 0.0.2.6.7-r1 1.0.0 1.0.5: C++ Driver for MongoDB
-dev-libs/mozldap 6.0.6-r2 6.0.7: Mozilla LDAP C SDK
+dev-libs/mozldap 6.0.6-r2 6.0.7 6.0.7-r1: Mozilla LDAP C SDK
 dev-libs/mpc 1.0.1 1.0.2 1.0.2-r1 1.0.3: A library for multiprecision complex arithmetic with exact rounding
 dev-libs/mpfr 2.4.2_p3-r1 3.1.3_p4 3.1.4: library for multiple-precision floating-point computations with exact rounding
 dev-libs/mps 1.106.2 1.110.0 1.111.0 1.114.0: Ravenbrook Memory Pool System
@@ -7177,7 +7177,7 @@ dev-python/easy-thumbnails 2.2: Easy thumbnails for Django
 dev-python/ecdsa 0.13: ECDSA cryptographic signature library in pure Python
 dev-python/ed25519ll 0.6: A low-level ctypes wrapper for Ed25519 digital signatures.
 dev-python/editobj 0.5.7-r1 0.5.7-r2: EditObj can create a dialog box to edit ANY Python object
-dev-python/edpwd 0.0.7: Encrypt/Decrypt Password Library that wraps up Blowfish
+dev-python/edpwd 0.0.7 0.0.7-r1: Encrypt/Decrypt Password Library that wraps up Blowfish
 dev-python/egenix-mx-base 3.2.5 3.2.8 3.2.9: eGenix utils for Python
 dev-python/egg-python 2.25.3-r1: EggTrayIcon bindings for Python
 dev-python/elasticsearch-curator 3.4.0 3.4.1 3.5.1: Tending time-series indices in Elasticsearch
@@ -7770,7 +7770,7 @@ dev-python/pyformance 0.3.2: Performance metrics, based on Coda Hale's Yammer me
 dev-python/pyftpdlib 1.4.0: Python FTP server library
 dev-python/pygal 1.5.1 1.7.0 2.0.0 2.0.1 2.1.1: A python SVG charts generator
 dev-python/pygame 1.9.2_pre20120101-r2: Python bindings for SDL multimedia library
-dev-python/pygame_sdl2 6.99.6: Reimplementation of portions of the pygame API using SDL2
+dev-python/pygame_sdl2 6.99.6 6.99.6-r1: Reimplementation of portions of the pygame API using SDL2
 dev-python/pygccxml 1.0.0 1.7.5: Generate an XML description of a C++ program from GCC's internal representation
 dev-python/pygene 0.2.1-r1: Simple python genetic algorithms programming library
 dev-python/pygeocoder 1.2.5: Python wrapper for Google Geocoding API V3
@@ -10006,7 +10006,7 @@ dev-vcs/git-crypt 0.3 0.4 0.5.0: transparent file encryption in git
 dev-vcs/git-deploy 6.0.1_p20131024: make deployments so easy that you'll let new hires do them on their first day
 dev-vcs/git-deps 9999: git commit dependency analysis tool
 dev-vcs/git-flow 1.9.1: Git extensions to provide high-level repository operations
-dev-vcs/git-imerge 0.7.0: Incremental merge for git
+dev-vcs/git-imerge 0.7.0 0.7.0-r1: Incremental merge for git
 dev-vcs/git-mailz 0.12 0.14: Send a collection of patches as emails
 dev-vcs/git-mantle 0.6: Generate an overview of changes on a branch
 dev-vcs/git-merge-changelog 20140223: Git merge driver for GNU style ChangeLog files
@@ -10054,7 +10054,7 @@ dev-vcs/svneverever 1.2.2-r1 1.3.0: Tool collecting path entries across SVN hist
 dev-vcs/svnmailer 1.0.9-r1: A subversion commit notifier written in Python
 dev-vcs/tig 2.1.1: text mode interface for git
 dev-vcs/tkcvs 8.2.2 8.2.3: Tcl/Tk-based graphical interface to CVS with Subversion support
-dev-vcs/topgit 0.9: A different patch queue manager
+dev-vcs/topgit 0.9 0.9-r1: A different patch queue manager
 dev-vcs/tortoisehg 3.3.2 3.7.3 3.8.1 3.8.3 9999: Set of graphical tools for Mercurial
 dev-vcs/vcsh 1.20150502 1.20151229: Manage config files in $HOME via fake bare git repositories
 dev-vcs/veracity 1.0.0.10517 1.1.0.10565: A modern and featureful DVCS (distributed version control system)
@@ -15731,7 +15731,7 @@ sci-electronics/xnec2c 2.8 3.0 3.1 3.2 3.3 3.4: A GTK+ graphical interactive ver
 sci-electronics/xoscope 2.0 2.1: Soundcard Oscilloscope for X
 sci-geosciences/bt747 2.1.3 2.1.7: MTK GPS Datalogger Device Control
 sci-geosciences/cdat-lite 6.0_rc2: Large suite of open source tools for the management and analysis of climate data
-sci-geosciences/congen 1.6.2: A package for generating the speeds, equilibrium arguments, and node factors of tidal constituents
+sci-geosciences/congen 1.6.2 1.6.2-r1: Generate the speeds, equilibrium arguments, and node factors of tidal constituents
 sci-geosciences/foxtrotgps 1.1.0 1.1.1 1.2.0: Easy to use, fast and lightweight mapping application (fork of tangogps)
 sci-geosciences/gdal-grass 2.0.0-r1 2.1.0: GDAL plugin to access GRASS data
 sci-geosciences/gebabbel 0.4: QT-Frontend to load and convert gps tracks with gpsbabel
@@ -15789,7 +15789,7 @@ sci-geosciences/routino 3.0_p1: Routing application based on openstreetmap data
 sci-geosciences/seawater 2.0.1 3.3.2 3.3.3 3.3.4: Python version of the SEAWATER 3.2 MATLAB toolkit for calculating the properties of sea water
 sci-geosciences/swmm 5.0.022: Storm Water Management Model - SWMM, hydrology, hydraulics, and water quality model
 sci-geosciences/tappy 0.9.0: Tidal Analysis in Python breaks hourly water level into tidal components
-sci-geosciences/tcd-utils 20120115: Utilities for working with Tidal Constituent Databases
+sci-geosciences/tcd-utils 20120115 20120115-r1: Utilities for working with Tidal Constituent Databases
 sci-geosciences/tilecache 2.11-r1: Web map tile caching system
 sci-geosciences/viking 1.6-r2 1.6.2: GPS data editor and analyzer
 sci-geosciences/xtide 2.13 2.13.1 2.13.2: XTide provides tide and current predictions in a wide variety of formats
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index ddc73cba13cf..4c9ef2976ffc 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 08 Jul 2016 16:22:43 +0000
+Fri, 08 Jul 2016 18:02:43 +0000