diff --git a/dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
similarity index 56%
rename from dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild
rename to dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
index 191f460a9193..efbd91f14157 100644
--- a/dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.8.1-r1.ebuild,v 1.6 2014/08/10 20:10:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-1.8.1-r2.ebuild,v 1.3 2015/07/09 09:48:50 monsieurp Exp $
 
-EAPI=2
+EAPI=5
 JAVA_PKG_IUSE="doc examples source test"
 
 inherit eutils java-pkg-2 java-ant-2
@@ -17,38 +17,34 @@ SLOT="0"
 KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 IUSE=""
 
-RDEPEND=">=virtual/jre-1.4
-	dev-java/commons-beanutils:1.7
+CDEPEND="dev-java/commons-beanutils:1.7
 	>=dev-java/commons-collections-2.1:0
 	>=dev-java/commons-logging-1.0.2:0"
-DEPEND=">=virtual/jdk-1.4
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+DEPEND=">=virtual/jdk-1.6
 	test? (
 		dev-java/junit:0
-		dev-java/ant-junit
+		dev-java/ant-junit:0
 	)
-	${RDEPEND}"
+	${CDEPEND}"
 
 S="${WORKDIR}/${P}-src"
 
 # don't rewrite build.xml in examples
 JAVA_PKG_BSFIX_ALL="no"
 
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging"
+
 java_prepare() {
 	epatch "${FILESDIR}/${PV}-build.xml-jar-target.patch"
-
-	# this build.xml honours build.properties so we use it for common depends
-	# needed for both compile and test, so getjar is called only once
-	echo "commons-beanutils.jar=$(java-pkg_getjar commons-beanutils-1.7 \
-		commons-beanutils.jar)" > build.properties
-	echo "commons-collections.jar=$(java-pkg_getjar commons-collections \
-		commons-collections.jar)" >> build.properties
-	echo "commons-logging.jar=$(java-pkg_getjar commons-logging \
-		commons-logging.jar)" >> build.properties
 }
 
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
+
 src_test() {
-	ANT_TASKS="ant-junit" eant \
-		-Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" test
+	java-pkg-2_src_test
 }
 
 src_install() {
diff --git a/dev-java/commons-digester/commons-digester-2.1.ebuild b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
similarity index 66%
rename from dev-java/commons-digester/commons-digester-2.1.ebuild
rename to dev-java/commons-digester/commons-digester-2.1-r1.ebuild
index 2e03711da933..b46d0a013ff8 100644
--- a/dev-java/commons-digester/commons-digester-2.1.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r1.ebuild
@@ -1,12 +1,10 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-2.1.ebuild,v 1.3 2014/08/10 20:10:27 slyfox Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-2.1-r1.ebuild,v 1.2 2015/07/09 09:37:46 monsieurp Exp $
 
 EAPI="5"
 
-# See bug #480758.
-RESTRICT="test"
-JAVA_PKG_IUSE="doc examples source" # test
+JAVA_PKG_IUSE="doc examples source test"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -18,35 +16,35 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
+KEYWORDS="amd64 ppc ppc64 x86 ~x86-fbsd"
 
-RDEPEND=">=virtual/jre-1.5
-	dev-java/commons-beanutils:1.7
+CDEPEND="dev-java/commons-beanutils:1.7
 	>=dev-java/commons-collections-2.1:0
 	>=dev-java/commons-logging-1.0.2:0"
 
-DEPEND=">=virtual/jdk-1.5
-	${RDEPEND}"
-#	test? (
-#		dev-java/junit:0
-#		dev-java/ant-junit
-#	)
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	${CDEPEND}
+	test? (
+		dev-java/junit:0
+		dev-java/ant-junit:0
+	)"
 
 S="${WORKDIR}/${P}-src"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-collections,commons-logging"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
 
 java_prepare() {
 	cp "${FILESDIR}"/${P}-build.xml build.xml || die
 }
 
-src_test() {
-	java-pkg_jar-from --build-only junit
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit"
 
-	ANT_TASKS="ant-junit" eant \
-		-Djunit.jar="$(java-pkg_getjar --build-only junit junit.jar)" test
+src_test() {
+	java-pkg-2_src_test
 }
 
 src_install() {
diff --git a/dev-java/commons-digester/commons-digester-3.2-r1.ebuild b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
similarity index 75%
rename from dev-java/commons-digester/commons-digester-3.2-r1.ebuild
rename to dev-java/commons-digester/commons-digester-3.2-r2.ebuild
index 07555457c7ba..fb96a61c391e 100644
--- a/dev-java/commons-digester/commons-digester-3.2-r1.ebuild
+++ b/dev-java/commons-digester/commons-digester-3.2-r2.ebuild
@@ -1,12 +1,10 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-3.2-r1.ebuild,v 1.3 2015/06/14 15:08:20 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/commons-digester/commons-digester-3.2-r2.ebuild,v 1.2 2015/07/09 09:37:46 monsieurp Exp $
 
 EAPI="5"
 
-# See bug #480758.
-RESTRICT="test"
-JAVA_PKG_IUSE="doc examples source" # test
+JAVA_PKG_IUSE="doc examples source test"
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -18,7 +16,7 @@ SRC_URI="mirror://apache/commons/digester/source/${MY_P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="3.2"
-KEYWORDS="amd64 x86 ppc ~ppc64"
+KEYWORDS="amd64 x86 ppc ppc64"
 
 CDEPEND="dev-java/cglib:3
 	dev-java/commons-beanutils:1.7
@@ -28,28 +26,28 @@ RDEPEND=">=virtual/jre-1.6
 	${CDEPEND}"
 
 DEPEND=">=virtual/jdk-1.6
-	${RDEPEND}"
-
-#	test? (
-#		dev-java/junit:4
-#		dev-java/ant-junit
-#	)
+	${CDEPEND}
+	test? (
+		dev-java/junit:4
+		dev-java/ant-junit:0
+	)"
 
 S="${WORKDIR}/${MY_P}"
 
 JAVA_ANT_REWRITE_CLASSPATH="true"
 EANT_GENTOO_CLASSPATH="commons-beanutils-1.7,commons-logging,cglib-3"
-EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
 
 java_prepare() {
 	cp "${FILESDIR}"/${PN}-2.1-build.xml build.xml || die
+
+	# Doesn't work.
+	rm -v src/test/java/org/apache/commons/digester3/Digester153TestCase.java
 }
 
-src_test() {
-	java-pkg_jar-from --build-only junit-4
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
 
-	ANT_TASKS="ant-junit" eant \
-		-Djunit.jar="$(java-pkg_getjar --build-only junit-4 junit.jar)" test
+src_test() {
+	java-pkg-2_src_test
 }
 
 src_install() {
diff --git a/dev-java/commons-digester/files/commons-digester-2.1-build.xml b/dev-java/commons-digester/files/commons-digester-2.1-build.xml
index 5e32796990c4..505df88a8abc 100644
--- a/dev-java/commons-digester/files/commons-digester-2.1-build.xml
+++ b/dev-java/commons-digester/files/commons-digester-2.1-build.xml
@@ -154,6 +154,7 @@
           <exclude name="**/TestRule.java"/>
           <exclude name="**/TestRuleSet.java"/>
           <exclude name="**/Test*$*.java"/>
+		      <exclude name="**/*Abstract*.java"/>
         </fileset>
       </batchtest>
       <batchtest todir="${maven.test.reports}" if="test">
diff --git a/dev-lang/polyml/Manifest b/dev-lang/polyml/Manifest
index 7b0447a67855..d1addf494e18 100644
--- a/dev-lang/polyml/Manifest
+++ b/dev-lang/polyml/Manifest
@@ -1,4 +1,4 @@
-DIST polyml.5.2.1.tar.gz 4114551 SHA256 c84148ae9a28e782f48208bcb8c5b82ee7bfdc178784fe81694cf1f0789ae62e SHA512 c3971eb7765712acfe19a48c91183eb1a93b537cdcf479bc70b47676f1a5d93a1cb966839298607274d077df3419c74dcaed319e4b4c0f79e3e78c36f2af428e WHIRLPOOL e02aa5e4995b9f70a04c700bb53306ed712aaf99a8cf2ff9f0a1dd465ccbe905348b7dcad3c6b9528c1b62293f62fb917e5fa9409bd72852897a933776a2fb51
 DIST polyml.5.4.1.tar.gz 6107319 SHA256 514d1d07be487b783d4dfa29dbd550b3396640579ce135a9eb5a61f08e7f9cac SHA512 4a7b404ed648b5a9fd9d52917214688d15f4f9a5f4570ba13b52a8304bde1cc4b534f539ffc3c9554283816ae130e4c898a179d776df6d3220fba9743a19b175 WHIRLPOOL 048db0b2210d699c0a86940daaafd24bfc81debae412f7e7dcad2585cd5514253f6c47e0006277ef00b640ab971a031d74e64c78c4abcc09712fa9e8593d1720
 DIST polyml.5.5.1.tar.gz 5465794 SHA256 cf8009dabc8b5d308d92e201dcd01f17ce14289d30caa8021a87365f4b8e209a SHA512 283954c8bf5599d83ea69916b827b1acae7137fe4add67537026092da2e6f1a89d71d3a394dbba599bbe9e967ded1446f39f4d81afb90301532db6be949f7a6f WHIRLPOOL 5bfeb8dcedcfe9b0a925ed089abc246d70d1269631ee46e9c78b123d461afb80e68640d6c08d77f47e69b0c244e9c7a27750dd7350741911e007f9dbcb2e7f76
+DIST polyml.5.5.2.tar.gz 5599140 SHA256 73fd2be89f7e3ff0567e27ef525ef788775d9f963d6db54069cb34d53040a682 SHA512 248c2a38c4691898bc1243a041f4683bf227d9c8a98c6c3545af2a8a3249ed5ed96f33f90cb2dede8809b42f33c0557650147302cfe046a5fba965ccd93cbc5b WHIRLPOOL d8dae553b6d4effef80b4303ea8fdbb95f8470790ab7ff49e62ae2a47d70d9d0b11b2113caa28302c029049041bd0286ba06a2153b5266b88a6c26eb1714abf7
 DIST polyml.5.5.tar.gz 5504389 SHA256 2b20e597e6fe43df1b0ed01e78e410c6b51d0ac7911833e91d94fcc9eb05d831 SHA512 4725c2e4a786b8c63bc6fc1cadad0de818ed935014d51040af43defa07b03ba7bedb2185bfb2e39a0db7284479e79e698b31ec7fe8463c306b668de1eda69b89 WHIRLPOOL 166c7d0037dff771251c95e17d86a6208d926a5adbbac0188426dfe09b7cdbab1b620919068a722f34377fbc59966145ebd1cba5dcb0664943cc82c10d3b5688
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch b/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch
new file mode 100644
index 000000000000..1451d2df8d84
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.5.2-r1952-check_for_negative_sized_array.patch
@@ -0,0 +1,13 @@
+Index: polyml/basis/Array.sml
+===================================================================
+--- polyml/basis/Array.sml	(revision 1951)
++++ polyml/basis/Array.sml	(revision 1952)
+@@ -129,7 +129,7 @@
+      
+     fun array(len, a) =
+         let
+-            val () = if len >= maxLen then raise General.Size else ()
++            val () = if len < 0 orelse len >= maxLen then raise General.Size else ()
+             val vec = System_alloc(len+1, 0wx40, RunCall.unsafeCast a)
+         in
+             System_setw(vec, 0, RunCall.unsafeCast len);
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch b/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch
new file mode 100644
index 000000000000..783577026f67
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch
@@ -0,0 +1,112 @@
+Index: polyml/libpolyml/foreign.cpp
+===================================================================
+--- polyml/libpolyml/foreign.cpp	(revision 1953)
++++ polyml/libpolyml/foreign.cpp	(revision 1954)
+@@ -4,7 +4,7 @@
+ 
+     Copyright (c) 2000-7
+         Cambridge University Technical Services Limited
+-    Further development Copyright David C.J. Matthews 2008-2011.
++    Further development Copyright David C.J. Matthews 2008-2014.
+ 
+     This library is free software; you can redistribute it and/or
+     modify it under the terms of the GNU Lesser General Public
+@@ -251,6 +251,10 @@
+ 
+ static Volatile *vols;
+ static PLock volLock; // Mutex to protect vols.
++// TODO: There is a theoretical risk of deadlock if any ML allocation is made while this
++// lock is held.  An allocation can result in a GC which requires all threads to release
++// ML memory but another thread could block waiting for the mutex.
++// N.B. raising an exception involves an allocation.
+ 
+ #define FIRST_VOL 0
+ 
+@@ -268,24 +272,8 @@
+ static unsigned callBackEntries = 0;
+ static PLock callbackTableLock; // Mutex to protect table.
+ 
+-
+ /**********************************************************************
+  *
+- *  Malloc / Free Wrappers
+- *   
+- **********************************************************************/
+-
+-static POLYUNSIGNED malloc_count = 0;
+-#if 0
+-#define Vmalloc(where,size) {where = malloc(size); printf("malloc: %p,%d\n",where,size); fflush(stdout); malloc_count++;}
+-#else
+-#define Vmalloc(where,size) {where = malloc(size); malloc_count++;}
+-#endif
+-#define Vfree(p) { free(p);  malloc_count--;}
+-
+-
+-/**********************************************************************
+- *
+  *  Volatile Allocation
+  *   
+  **********************************************************************/
+@@ -349,8 +337,12 @@
+     PLocker plocker(&volLock);
+     Handle res = vol_alloc(taskData);
+     trace(("size= %" POLYUFMT "\n",size));
+-    Vmalloc( C_POINTER(UNVOLHANDLE(res)), size );
++    void *p = malloc(size);
++    if (p == 0)
++        RAISE_EXN("Insufficient memory");
++    C_POINTER(UNVOLHANDLE(res)) = p;
+     OWN_C_SPACE(UNVOLHANDLE(res)) = true;
++
+     return res;
+ }
+ 
+@@ -685,7 +677,7 @@
+             {
+                 // Can now free this.            
+                 trace(("Freeing malloc space of <%" POLYUFMT ">\n",from));
+-                Vfree(vols[from].C_pointer);
++                free(vols[from].C_pointer);
+                 vols[from].C_pointer = 0;
+                 vols[from].Own_C_space = false;
+             }
+@@ -702,7 +694,6 @@
+         }
+     }
+     next_vol = to;
+-    info(("unfreed mallocs=<%" POLYUFMT "> next_vol=<%" POLYUFMT ">\n", malloc_count, next_vol));
+     
+     /* Callback table.  Added DCJM 12/4/04.  We always process these as strong references.
+     For the time being at any rate we treat these as permanent entries so that once a
+@@ -910,8 +901,9 @@
+         RAISE_EXN("libffi error: ffi_prep_cif failed");
+ 
+     // malloc memory for the result
+-    void *result;
+-    Vmalloc(result, result_type->size);
++    void *result = malloc(result_type->size);
++    if (result == 0)
++        RAISE_EXN("Insufficient memory to allocate space for result");
+ 
+     processes->ThreadReleaseMLMemory(taskData);
+     ffi_call(&cif, sym, result, arg_values);
+@@ -1580,6 +1572,9 @@
+ 
+     unsigned num_args = length_list(argTypeList->Word());
+     ffi_type **arg_types = (ffi_type**)malloc(num_args * sizeof(ffi_type*));
++    if (arg_types == 0)
++        RAISE_EXN("Insufficient memory to allocate space for arguments");
++
+     PolyWord p = argTypeList->Word();
+     for (POLYUNSIGNED i=0; i<num_args; i++,p=Tail(p))
+         arg_types[i] = ctypeToFfiType(taskData, Head(p));
+@@ -1587,6 +1582,9 @@
+ 
+     // The cif needs to be on the heap so that it is available in the callback.
+     ffi_cif *cif = (ffi_cif *)malloc(sizeof(ffi_cif));
++    if (cif == 0)
++        RAISE_EXN("Insufficient memory to allocate space for cif");
++
+     if (ffi_prep_cif(cif, abi, num_args, result_type, arg_types) != FFI_OK)
+         RAISE_EXN("libffi error: ffi_prep_cif failed");
+ 
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch b/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch
new file mode 100644
index 000000000000..36c82947f37b
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch
@@ -0,0 +1,27 @@
+Index: polyml/libpolyml/gc_mark_phase.cpp
+===================================================================
+--- polyml/libpolyml/gc_mark_phase.cpp	(revision 2006)
++++ polyml/libpolyml/gc_mark_phase.cpp	(revision 2007)
+@@ -130,13 +130,6 @@
+                     if (locPtr == LARGECACHE_SIZE) locPtr = 0;
+                     largeObjectCache[locPtr].base = obj;
+                     largeObjectCache[locPtr].current = currentPtr;
+-                    // To try to narrow down a bug that results in the ASSERT failing,
+-                    // add these extra checks.
+-                    POLYUNSIGNED lengthWord = obj->LengthWord();
+-                    ASSERT (OBJ_IS_LENGTH(lengthWord));
+-                    POLYUNSIGNED length = OBJ_OBJECT_LENGTH(lengthWord);
+-                    ASSERT(length == originalLength);
+-                    ASSERT(currentPtr > (PolyWord*)obj && currentPtr < ((PolyWord*)obj)+length);
+                 }
+             }
+             else StackOverflow(obj);
+@@ -579,6 +572,8 @@
+     ASSERT(nInUse == 0);
+     MTGCProcessMarkPointers *marker = &markStacks[0];
+     marker->active = true;
++    marker->locPtr = 0;
++    marker->largeObjectCache[0].base = 0;
+     nInUse = 1;
+ 
+     // Scan the permanent mutable areas.
diff --git a/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch b/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch
new file mode 100644
index 000000000000..0629f12f72ca
--- /dev/null
+++ b/dev-lang/polyml/files/polyml-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch
@@ -0,0 +1,21 @@
+Index: polyml/libpolyml/gc_mark_phase.cpp
+===================================================================
+--- polyml/libpolyml/gc_mark_phase.cpp	(revision 2008)
++++ polyml/libpolyml/gc_mark_phase.cpp	(revision 2009)
+@@ -176,6 +176,16 @@
+     // Clear the mark stack
+     for (unsigned i = 0; i < MARK_STACK_SIZE; i++)
+         markStack[i] = 0;
++    // Clear the large object cache.  Actually only largeObjectCache[0].base
++    // needs to be set to zero and for the objects allocated on the heap it is
++    // cleared before each GC in either MarkRoots or MarkPointersTask.
++    // The remianing case is the RescanMarked sub-class which is allocated on the stack
++    // but it doesn't hurt to clear it in all cases.
++    for (unsigned j = 0; j < LARGECACHE_SIZE; j++)
++    {
++        largeObjectCache[locPtr].base = 0;
++        largeObjectCache[locPtr].current = 0;
++    }
+ }
+ 
+ // Called when the stack has overflowed.  We need to include this
diff --git a/dev-lang/polyml/polyml-5.2.1.ebuild b/dev-lang/polyml/polyml-5.2.1.ebuild
deleted file mode 100644
index 630d3020f4a2..000000000000
--- a/dev-lang/polyml/polyml-5.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.2.1.ebuild,v 1.3 2009/01/11 19:16:52 maekke Exp $
-
-MY_P=${PN}.${PV}
-
-DESCRIPTION="Poly/ML is a full implementation of Standard ML"
-HOMEPAGE="http://www.polyml.org"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X"
-
-DEPEND=""
-RDEPEND=""
-
-S=${WORKDIR}/${MY_P}
-
-src_compile() {
-	econf $(use_with X)
-
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-}
diff --git a/dev-lang/polyml/polyml-5.4.1.ebuild b/dev-lang/polyml/polyml-5.4.1.ebuild
index 1eee8a2d5cf5..59faf3c3f5a0 100644
--- a/dev-lang/polyml/polyml-5.4.1.ebuild
+++ b/dev-lang/polyml/polyml-5.4.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.4.1.ebuild,v 1.6 2012/12/05 09:49:35 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.4.1.ebuild,v 1.7 2015/07/09 09:46:32 gienah Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="X elibc_glibc +gmp portable test +threads"
 
-RDEPEND="X? ( x11-libs/motif )
+RDEPEND="X? ( x11-libs/motif:0 )
 		gmp? ( >=dev-libs/gmp-5 )
 		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )"
 DEPEND="${RDEPEND}"
diff --git a/dev-lang/polyml/polyml-5.5.0.ebuild b/dev-lang/polyml/polyml-5.5.0.ebuild
index 2ced5678abab..953740159dbc 100644
--- a/dev-lang/polyml/polyml-5.5.0.ebuild
+++ b/dev-lang/polyml/polyml-5.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.5.0.ebuild,v 1.3 2012/12/05 09:49:35 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.5.0.ebuild,v 1.4 2015/07/09 09:46:32 gienah Exp $
 
 EAPI="5"
 
@@ -20,7 +20,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="X elibc_glibc +gmp portable test +threads"
 
-RDEPEND="X? ( x11-libs/motif )
+RDEPEND="X? ( x11-libs/motif:0 )
 		gmp? ( >=dev-libs/gmp-5 )
 		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
 		virtual/libffi"
diff --git a/dev-lang/polyml/polyml-5.5.1.ebuild b/dev-lang/polyml/polyml-5.5.1.ebuild
index 4e902728cb46..2cbc5149e144 100644
--- a/dev-lang/polyml/polyml-5.5.1.ebuild
+++ b/dev-lang/polyml/polyml-5.5.1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.5.1.ebuild,v 1.1 2014/02/11 14:35:09 gienah Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.5.1.ebuild,v 1.2 2015/07/09 09:46:32 gienah Exp $
 
 EAPI="5"
 
@@ -17,7 +17,7 @@ SLOT="0/${PV}"
 KEYWORDS="~amd64 ~x86"
 IUSE="X elibc_glibc +gmp portable test +threads"
 
-RDEPEND="X? ( x11-libs/motif )
+RDEPEND="X? ( x11-libs/motif:0 )
 		gmp? ( >=dev-libs/gmp-5 )
 		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
 		virtual/libffi"
diff --git a/dev-lang/polyml/polyml-5.5.2.ebuild b/dev-lang/polyml/polyml-5.5.2.ebuild
new file mode 100644
index 000000000000..07d5e84e3e40
--- /dev/null
+++ b/dev-lang/polyml/polyml-5.5.2.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-lang/polyml/polyml-5.5.2.ebuild,v 1.1 2015/07/09 09:46:32 gienah Exp $
+
+EAPI="5"
+
+inherit base autotools pax-utils
+
+MY_P="${PN}.${PV}"
+
+DESCRIPTION="Poly/ML is a full implementation of Standard ML"
+HOMEPAGE="http://www.polyml.org"
+SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
+
+LICENSE="LGPL-2.1"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="X elibc_glibc +gmp portable test +threads"
+
+RDEPEND="X? ( x11-libs/motif:0 )
+		gmp? ( >=dev-libs/gmp-5 )
+		elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
+		virtual/libffi"
+DEPEND="${RDEPEND}"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	# Bug 256679 - patch the assembler code.  The remaining executable stacks in ./.libs/poly
+	# comes from the polyml generated ./polyexport.o file.
+	"${FILESDIR}/${PN}-5.5.0-asm.patch"
+	# Patches from http://sourceforge.net/p/polyml/code/HEAD/tree/fixes-5.5.2
+	# which are required to build and run sci-mathematics/isabelle-2015
+	"${FILESDIR}/${PN}-5.5.2-r1952-check_for_negative_sized_array.patch"
+	"${FILESDIR}/${PN}-5.5.2-r1954_Fix_segfault_in_FFI_when_malloc_runs_out_of_memory.patch"
+	"${FILESDIR}/${PN}-5.5.2-r2007_Ensure_the_large_object_cache_pointer_is_cleared.patch"
+	"${FILESDIR}/${PN}-5.5.2-r2009_Initialise_the_largeObjectCache_fully_in_the_constructor.patch"
+)
+
+src_prepare() {
+	base_src_prepare
+	eautoreconf
+	if [ -f "${S}/Tests/Succeed/Test146.ML" ]; then
+		mv "${S}/Tests/Succeed/Test146.ML" "${S}/Tests/Succeed/Test146.ML.disable-test-as-it-fails"
+	fi
+}
+
+src_configure() {
+	econf \
+		--enable-shared \
+		--disable-static \
+		--with-system-libffi \
+		$(use_with X x) \
+		$(use_with gmp) \
+		$(use_with portable) \
+		$(use_with threads)
+}
+
+src_compile() {
+	# Bug 453146 - dev-lang/polyml-5.5.0: fails to build (pax kernel?)
+	pushd libpolyml || die "Could not cd to libpolyml"
+	emake
+	popd
+	emake polyimport
+	pax-mark m "${S}/.libs/polyimport"
+	emake
+	pax-mark m "${S}/.libs/poly"
+}
+
+src_test() {
+	emake tests || die "tests failed"
+}
diff --git a/dev-python/google-apitools/Manifest b/dev-python/google-apitools/Manifest
index c75624ac82f7..627222057746 100644
--- a/dev-python/google-apitools/Manifest
+++ b/dev-python/google-apitools/Manifest
@@ -1 +1,2 @@
 DIST google-apitools-0.4.6.tar.gz 122851 SHA256 1ff89a3b968e83b7fed87e43071decbffa6cfcf8a9adec4342708162b3018d54 SHA512 9b672776b72fba2edd30f2a9cf098dff352dda78075643d55b10187a0ee12e689982c920f76fe4d745ccab829e3ff1fd9818c306ffba20be93020748750e85b4 WHIRLPOOL abd70f06208e1d8b79cfa8b2cf5f01c40f0c520fbd744aa1bb400efd953fc151c0751045b29fdb9ab1610f995d75d640294444fd293a3e6f31fdf3255c0d4dfc
+DIST google-apitools-0.4.8.tar.gz 128587 SHA256 8d4009c5096cc1a8d9be73399bea678035d12c2e67e0d14dd9a9ceded8d771f7 SHA512 28570a050cb7e6c839e39f24908734696a72e05cdb6d84376faf637affd8bf116785411402eddccc1cfa692f753acd82c49ad04ccdce1e4aec66fe2b1b901320 WHIRLPOOL ec0cf908fe10e944199f4b677fd26f2099eb085261f7e2f2ff8441ab77f9cc2fe0fede9dd765fba8e47394f64e402e35fc0ad087af473992b35db665d67bc296
diff --git a/dev-python/google-apitools/google-apitools-0.4.8.ebuild b/dev-python/google-apitools/google-apitools-0.4.8.ebuild
new file mode 100644
index 000000000000..23e18b6f0b9d
--- /dev/null
+++ b/dev-python/google-apitools/google-apitools-0.4.8.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/google-apitools/google-apitools-0.4.8.ebuild,v 1.1 2015/07/09 10:14:47 vapier Exp $
+
+EAPI="5"
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="utilities to make it easier to build client-side tools, especially ones that use Google APIs"
+HOMEPAGE="https://github.com/google/apitools"
+SRC_URI="https://github.com/google/apitools/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND=">=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.4.8[${PYTHON_USEDEP}]
+	>=dev-python/protorpc-0.9.1[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/google-apputils-0.4.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S="${WORKDIR}/apitools-${PV}"
diff --git a/dev-ruby/ruby-atk/Manifest b/dev-ruby/ruby-atk/Manifest
index c926ad51f7b2..f7b137f79612 100644
--- a/dev-ruby/ruby-atk/Manifest
+++ b/dev-ruby/ruby-atk/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-gnome2-all-1.1.8.tar.gz 1018612 SHA256 5118fc18eeff60cbe371e6461dc6329e7c544f1908219df42462274dace5968a SHA512 3ce05278fca4b402f5e8ec9883290022ad07ea800af436ee35ab6a4960e4004a0c076567c68587bee81a27d863ba54de19a7816585ce510d308b7e0e91fb1981 WHIRLPOOL b59ed271675ca8f9b80aeecd7d003537011a7162131176ca202b7a40fafae27cc8da687a50792985f07477dcf310a70d0c512692d649b3584d64653af9cf0e1b
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-atk/ruby-atk-2.2.5.ebuild b/dev-ruby/ruby-atk/ruby-atk-2.2.5.ebuild
new file mode 100644
index 000000000000..b254f9788b8d
--- /dev/null
+++ b/dev-ruby/ruby-atk/ruby-atk-2.2.5.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-atk/ruby-atk-2.2.5.ebuild,v 1.1 2015/07/09 10:16:13 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Atk bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" dev-libs/atk"
+RDEPEND+=" dev-libs/atk"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' test/atk-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index bdc4baeecf34..eeb791e8efbc 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-2.2.5.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-2.2.5.ebuild
new file mode 100644
index 000000000000..e33c53a3c66b
--- /dev/null
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-2.2.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-2.2.5.ebuild,v 1.1 2015/07/09 11:49:58 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+RUBY_S="ruby-gnome2-all-${PV}/cairo-gobject"
+
+DESCRIPTION="Ruby cairo-gobject bindings"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+DEPEND+=" x11-libs/cairo"
+RDEPEND+=" x11-libs/cairo"
+
+ruby_add_rdepend "dev-ruby/rcairo
+	>=dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		test/cairo-gobject-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-clutter/Manifest b/dev-ruby/ruby-clutter/Manifest
index bdc4baeecf34..eeb791e8efbc 100644
--- a/dev-ruby/ruby-clutter/Manifest
+++ b/dev-ruby/ruby-clutter/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-clutter/ruby-clutter-2.2.5.ebuild b/dev-ruby/ruby-clutter/ruby-clutter-2.2.5.ebuild
new file mode 100644
index 000000000000..d5eb0b229e69
--- /dev/null
+++ b/dev-ruby/ruby-clutter/ruby-clutter-2.2.5.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-clutter/ruby-clutter-2.2.5.ebuild,v 1.1 2015/07/09 12:00:17 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Clutter bindings"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+RUBY_S=ruby-gnome2-all-${PV}/clutter
+
+DEPEND+=" media-libs/clutter"
+RDEPEND+=" media-libs/clutter"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-cairo-gobject-${PV}
+	>=dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' \
+		../gobject-introspection/test/gobject-introspection-test-utils.rb \
+		../cairo-gobject/test/cairo-gobject-test-utils.rb \
+		test/clutter-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_configure() {
+	:
+}
+
+each_ruby_compile() {
+	:
+}
+
+each_ruby_test() {
+	VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+	virtualmake || die
+}
+
+each_ruby_install() {
+	each_fakegem_install
+}
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild
index b359c8679f05..bfc288d3a2d0 100644
--- a/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild
+++ b/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild,v 1.3 2015/07/05 10:13:04 mrueg Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-glib2/ruby-glib2-2.2.3.ebuild,v 1.4 2015/07/09 10:29:10 mrueg Exp $
 
 EAPI=5
 USE_RUBY="ruby19 ruby20"
@@ -16,6 +16,8 @@ DEPEND+=" >=dev-libs/glib-2"
 ruby_add_bdepend "dev-ruby/pkg-config
 	test? ( >=dev-ruby/test-unit-2 )"
 
+RUBY_PATCHES="${FILESDIR}/${P}-glib-2.44.patch" #554126
+
 all_ruby_prepare() {
 	# Our sandbox always provides LD_PRELOAD in the environment.
 	sed -i -e 's/unless ENV.empty?/unless (ENV.keys - ["LD_PRELOAD"]).empty?/' test/test_spawn.rb || die
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index bdc4baeecf34..eeb791e8efbc 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-2.2.5.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-2.2.5.ebuild
new file mode 100644
index 000000000000..a29ad39a91d9
--- /dev/null
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-2.2.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-2.2.5.ebuild,v 1.1 2015/07/09 09:42:23 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/gobject-introspection
+
+DESCRIPTION="Ruby GObjectIntrospection bindings"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+DEPEND+=" dev-libs/gobject-introspection"
+RDEPEND+=" dev-libs/gobject-introspection"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
+
+all_ruby_prepare() {
+	# Remove pregenerated Makefile since it will otherwise be shared by all targets.
+	rm -f Makefile Makefile.lib ext/gobject-introspection/Makefile || die
+
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' test/gobject-introspection-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-gstreamer/Manifest b/dev-ruby/ruby-gstreamer/Manifest
index 80f71d863c0b..da891c4a4915 100644
--- a/dev-ruby/ruby-gstreamer/Manifest
+++ b/dev-ruby/ruby-gstreamer/Manifest
@@ -1,3 +1,4 @@
 DIST ruby-gnome2-all-1.1.8.tar.gz 1018612 SHA256 5118fc18eeff60cbe371e6461dc6329e7c544f1908219df42462274dace5968a SHA512 3ce05278fca4b402f5e8ec9883290022ad07ea800af436ee35ab6a4960e4004a0c076567c68587bee81a27d863ba54de19a7816585ce510d308b7e0e91fb1981 WHIRLPOOL b59ed271675ca8f9b80aeecd7d003537011a7162131176ca202b7a40fafae27cc8da687a50792985f07477dcf310a70d0c512692d649b3584d64653af9cf0e1b
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
 DIST ruby-gnome2-all-2.2.4.tar.gz 1699429 SHA256 9274e21b2613ec9ef8b73dd27d180b3fa8b8214a442d742121b0d1cc7f313670 SHA512 33e79109e3acdb1fae07a2b4c867d9b83508ed275dd8fc6148bc976a9fefa2ea0cede01a6762570bdaf1d53173df40b978366837363b4d956b864c6a5f08bf39 WHIRLPOOL bb6a57ee7e4822d807d4506b8c78da1711b222d636d01a55792c5ba37b747997e3288afea3afeb71c96f75f2d58931d283a639632d7fcb1d8b1bc36c294a32af
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-gstreamer/ruby-gstreamer-2.2.5.ebuild b/dev-ruby/ruby-gstreamer/ruby-gstreamer-2.2.5.ebuild
new file mode 100644
index 000000000000..e840eeb5ce65
--- /dev/null
+++ b/dev-ruby/ruby-gstreamer/ruby-gstreamer-2.2.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gstreamer/ruby-gstreamer-2.2.5.ebuild,v 1.1 2015/07/09 10:02:52 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby GStreamer bindings"
+KEYWORDS="~amd64 ~ppc"
+IUSE=""
+
+RDEPEND="${RDEPEND}
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+DEPEND="${DEPEND}
+	dev-libs/gobject-introspection
+	media-libs/gstreamer:1.0
+	media-libs/gst-plugins-base:1.0"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}
+"
+
+all_ruby_prepare() {
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+	virtualmake || die
+}
diff --git a/dev-ruby/ruby-gtk2/Manifest b/dev-ruby/ruby-gtk2/Manifest
index c926ad51f7b2..f7b137f79612 100644
--- a/dev-ruby/ruby-gtk2/Manifest
+++ b/dev-ruby/ruby-gtk2/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-gnome2-all-1.1.8.tar.gz 1018612 SHA256 5118fc18eeff60cbe371e6461dc6329e7c544f1908219df42462274dace5968a SHA512 3ce05278fca4b402f5e8ec9883290022ad07ea800af436ee35ab6a4960e4004a0c076567c68587bee81a27d863ba54de19a7816585ce510d308b7e0e91fb1981 WHIRLPOOL b59ed271675ca8f9b80aeecd7d003537011a7162131176ca202b7a40fafae27cc8da687a50792985f07477dcf310a70d0c512692d649b3584d64653af9cf0e1b
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-gtk2/ruby-gtk2-2.2.5.ebuild b/dev-ruby/ruby-gtk2/ruby-gtk2-2.2.5.ebuild
new file mode 100644
index 000000000000..990be9767db5
--- /dev/null
+++ b/dev-ruby/ruby-gtk2/ruby-gtk2-2.2.5.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-gtk2/ruby-gtk2-2.2.5.ebuild,v 1.1 2015/07/09 10:30:45 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit virtualx ruby-ng-gnome2
+
+DESCRIPTION="Ruby Gtk2 bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/gtk+:2
+	x11-themes/hicolor-icon-theme"
+RDEPEND+=" x11-libs/gtk+:2"
+
+ruby_add_bdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+ruby_add_rdepend ">=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/ruby-atk-${PV}
+	>=dev-ruby/ruby-pango-${PV}"
+
+all_ruby_prepare() {
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/system/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	VIRTUALX_COMMAND="${RUBY} test/run-test.rb"
+	virtualmake || die
+}
diff --git a/dev-ruby/ruby-pango/Manifest b/dev-ruby/ruby-pango/Manifest
index c926ad51f7b2..f7b137f79612 100644
--- a/dev-ruby/ruby-pango/Manifest
+++ b/dev-ruby/ruby-pango/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-gnome2-all-1.1.8.tar.gz 1018612 SHA256 5118fc18eeff60cbe371e6461dc6329e7c544f1908219df42462274dace5968a SHA512 3ce05278fca4b402f5e8ec9883290022ad07ea800af436ee35ab6a4960e4004a0c076567c68587bee81a27d863ba54de19a7816585ce510d308b7e0e91fb1981 WHIRLPOOL b59ed271675ca8f9b80aeecd7d003537011a7162131176ca202b7a40fafae27cc8da687a50792985f07477dcf310a70d0c512692d649b3584d64653af9cf0e1b
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-pango/ruby-pango-2.2.5.ebuild b/dev-ruby/ruby-pango/ruby-pango-2.2.5.ebuild
new file mode 100644
index 000000000000..a56b809e1965
--- /dev/null
+++ b/dev-ruby/ruby-pango/ruby-pango-2.2.5.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-pango/ruby-pango-2.2.5.ebuild,v 1.1 2015/07/09 10:10:18 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Pango bindings"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+DEPEND+=" >=x11-libs/pango-1.2.1"
+RDEPEND+=" >=x11-libs/pango-1.2.1"
+
+ruby_add_rdepend ">=dev-ruby/ruby-glib2-${PV}
+	>=dev-ruby/rcairo-1.14.0"
+ruby_add_bdepend ">=dev-ruby/rcairo-1.14.0"
+
+all_ruby_prepare() {
+	# Remove test depending on specific locales to be set up: bug 526248
+	rm -f test/test-language.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-rsvg/Manifest b/dev-ruby/ruby-rsvg/Manifest
index c926ad51f7b2..f7b137f79612 100644
--- a/dev-ruby/ruby-rsvg/Manifest
+++ b/dev-ruby/ruby-rsvg/Manifest
@@ -1,2 +1,3 @@
 DIST ruby-gnome2-all-1.1.8.tar.gz 1018612 SHA256 5118fc18eeff60cbe371e6461dc6329e7c544f1908219df42462274dace5968a SHA512 3ce05278fca4b402f5e8ec9883290022ad07ea800af436ee35ab6a4960e4004a0c076567c68587bee81a27d863ba54de19a7816585ce510d308b7e0e91fb1981 WHIRLPOOL b59ed271675ca8f9b80aeecd7d003537011a7162131176ca202b7a40fafae27cc8da687a50792985f07477dcf310a70d0c512692d649b3584d64653af9cf0e1b
 DIST ruby-gnome2-all-2.2.3.tar.gz 1657315 SHA256 1611038c2a49fe051dfcc779aeca8eb47273718d80a0680442504fd54e228154 SHA512 cf6b0c88c91e444f5ff65a4a863630c5455315c08f1b44a5f7c81db51f998d6e83ab62e00276edb4a81ea9942405d76724f52134d2388010ec0f157a6a5dc34e WHIRLPOOL e5a6347b360b64f6b690a28483f8618d58786bbbf1fd6c691952271c85bf1d96dc8c97f1e4ed541f6cf8afac56221950db30873cc83a24210b6feef969eaf4b7
+DIST ruby-gnome2-all-2.2.5.tar.gz 1696485 SHA256 ef22418c95ce9f997235aee1a1b4d1265fad023e78a8f452bdd9e95267dd52b9 SHA512 60693ec2db4c4159a634f33bf7021e078cc06e25d4e10c6ac0c8a30ac03f9b8119ed94d9b62408a2010c9c3d1f812dea3ab5c6c617eda5d4c73272d64934159e WHIRLPOOL 161ae5b591bd1b6ba3601d46bc4fcfa6c57b006bd5903ba5a8c7ec670f11e06091ce5314290e24b312ecb61ceef22fb91231079f03f16a873a4e890142389123
diff --git a/dev-ruby/ruby-rsvg/ruby-rsvg-2.2.5.ebuild b/dev-ruby/ruby-rsvg/ruby-rsvg-2.2.5.ebuild
new file mode 100644
index 000000000000..8baacbeda3af
--- /dev/null
+++ b/dev-ruby/ruby-rsvg/ruby-rsvg-2.2.5.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ruby/ruby-rsvg/ruby-rsvg-2.2.5.ebuild,v 1.1 2015/07/09 10:52:21 graaff Exp $
+
+EAPI=5
+USE_RUBY="ruby19 ruby20 ruby21 ruby22"
+
+RUBY_FAKEGEM_NAME=rsvg2
+
+inherit ruby-ng-gnome2
+
+RUBY_S=ruby-gnome2-all-${PV}/rsvg2
+
+DESCRIPTION="Ruby bindings for librsvg"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+RDEPEND+=" >=gnome-base/librsvg-2.8"
+DEPEND+=" >=gnome-base/librsvg-2.8"
+
+ruby_add_rdepend "
+	>=dev-ruby/ruby-gdkpixbuf2-${PV}
+	>=dev-ruby/rcairo-1.12.8"
+
+all_ruby_prepare() {
+	# Avoid unneeded dependency on test-unit-notify.
+	sed -i -e '/notify/ s:^:#:' test/rsvg2-test-utils.rb || die
+
+	# Avoid compilation of dependencies during test.
+	sed -i -e '/and have_make/,/^  end/ s:^:#:' test/run-test.rb || die
+}
+
+each_ruby_test() {
+	${RUBY} test/run-test.rb || die
+}
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index aac397669162..5704a5a04567 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Thu, 09 Jul 2015 09:36:50 +0000
+Thu, 09 Jul 2015 13:06:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index aac397669162..5704a5a04567 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Thu, 09 Jul 2015 09:36:50 +0000
+Thu, 09 Jul 2015 13:06:52 +0000
diff --git a/metadata/md5-cache/dev-java/commons-digester-2.1 b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
similarity index 59%
rename from metadata/md5-cache/dev-java/commons-digester-2.1
rename to metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
index bfc22293ad1a..e753b997c1f5 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1
+++ b/metadata/md5-cache/dev-java/commons-digester-1.8.1-r2
@@ -1,14 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.5 >=virtual/jre-1.5 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects within the system
 EAPI=5
 HOMEPAGE=http://commons.apache.org/digester/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.5 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2.1
-SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
+RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=0
+SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=76921261e591e77a893d198675df9b82
+_md5_=d59e0f8a6989d2848bcc83dfa05eeb84
diff --git a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r1 b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
similarity index 70%
rename from metadata/md5-cache/dev-java/commons-digester-1.8.1-r1
rename to metadata/md5-cache/dev-java/commons-digester-2.1-r1
index 9816ffc0c50c..9d3ad9cf1b49 100644
--- a/metadata/md5-cache/dev-java/commons-digester-1.8.1-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.4 test? ( dev-java/junit:0 dev-java/ant-junit ) >=virtual/jre-1.4 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 test? ( dev-java/junit:0 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects within the system
-EAPI=2
+EAPI=5
 HOMEPAGE=http://commons.apache.org/digester/
 IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
 KEYWORDS=amd64 ppc ppc64 x86 ~x86-fbsd
 LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.4 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-SLOT=0
-SRC_URI=mirror://apache/commons/digester/source/commons-digester-1.8.1-src.tar.gz
+RDEPEND=>=virtual/jre-1.6 dev-java/commons-beanutils:1.7 >=dev-java/commons-collections-2.1:0 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
+SLOT=2.1
+SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=c95d79ebe3250a107a2c15d37f7a41c9
+_md5_=22465a9c0794efa831a5664e66664f3e
diff --git a/metadata/md5-cache/dev-java/commons-digester-3.2-r1 b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
similarity index 67%
rename from metadata/md5-cache/dev-java/commons-digester-3.2-r1
rename to metadata/md5-cache/dev-java/commons-digester-3.2-r2
index aecd7c09091d..67da38220d4d 100644
--- a/metadata/md5-cache/dev-java/commons-digester-3.2-r1
+++ b/metadata/md5-cache/dev-java/commons-digester-3.2-r2
@@ -1,14 +1,13 @@
 DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.6 >=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=>=virtual/jdk-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Reads XML configuration files to provide initialization of various Java objects within the system
 EAPI=5
 HOMEPAGE=http://commons.apache.org/digester/
-IUSE=elibc_FreeBSD doc examples source elibc_FreeBSD
-KEYWORDS=amd64 x86 ppc ~ppc64
+IUSE=elibc_FreeBSD doc examples source test elibc_FreeBSD
+KEYWORDS=amd64 x86 ppc ppc64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.6 dev-java/cglib:3 dev-java/commons-beanutils:1.7 >=dev-java/commons-logging-1.0.2:0 >=dev-java/java-config-2.2.0 source? ( app-arch/zip )
-RESTRICT=test
 SLOT=3.2
 SRC_URI=mirror://apache/commons/digester/source/commons-digester3-3.2-src.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-ant-2	1091461b8b02f54fabcfbf159164ff15	java-pkg-2	1889f7787714c5f7e3b5bb1c2be07c1f	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=a6134898c40be3bc4e62b31cddf4b884
+_md5_=bd49d59685dfb291c07410c25a99d996
diff --git a/metadata/md5-cache/dev-lang/polyml-5.2.1 b/metadata/md5-cache/dev-lang/polyml-5.2.1
deleted file mode 100644
index 115bcd4ff7b9..000000000000
--- a/metadata/md5-cache/dev-lang/polyml-5.2.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Poly/ML is a full implementation of Standard ML
-HOMEPAGE=http://www.polyml.org
-IUSE=X
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1
-SLOT=0
-SRC_URI=mirror://sourceforge/polyml/polyml.5.2.1.tar.gz
-_md5_=ada4eedb7e11d624cdbc93e509bdc6da
diff --git a/metadata/md5-cache/dev-lang/polyml-5.4.1 b/metadata/md5-cache/dev-lang/polyml-5.4.1
index 18385dadfd7d..9bc00df077b7 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.4.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.4.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=http://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
+RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) )
 SLOT=0/5.4.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.4.1.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=f2a2294b00b5b94bafd079a19a24446a
+_md5_=0abbdcafabe9cbfce2666bc6f89fec49
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.0 b/metadata/md5-cache/dev-lang/polyml-5.5.0
index b60b03fbc2e0..5285364c0d42 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.0
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.0
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=http://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.0
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=52899ec945a0312d8ee7ba51a8848284
+_md5_=19461c61d1744c30d240ea1779ccae64
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.1 b/metadata/md5-cache/dev-lang/polyml-5.5.1
index a88a2d6d3502..26e1878c7845 100644
--- a/metadata/md5-cache/dev-lang/polyml-5.5.1
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DESCRIPTION=Poly/ML is a full implementation of Standard ML
 EAPI=5
 HOMEPAGE=http://www.polyml.org
 IUSE=X elibc_glibc +gmp portable test +threads
 KEYWORDS=~amd64 ~x86
 LICENSE=LGPL-2.1
-RDEPEND=X? ( x11-libs/motif ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
 SLOT=0/5.5.1
 SRC_URI=mirror://sourceforge/polyml/polyml.5.5.1.tar.gz
 _eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
-_md5_=1ae0affc16202ffed96184114d945d33
+_md5_=f2d6c8f701cb9437bd497d38febdbffb
diff --git a/metadata/md5-cache/dev-lang/polyml-5.5.2 b/metadata/md5-cache/dev-lang/polyml-5.5.2
new file mode 100644
index 000000000000..06b57a306606
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/polyml-5.5.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.14.1:1.14 >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=Poly/ML is a full implementation of Standard ML
+EAPI=5
+HOMEPAGE=http://www.polyml.org
+IUSE=X elibc_glibc +gmp portable test +threads
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1
+RDEPEND=X? ( x11-libs/motif:0 ) gmp? ( >=dev-libs/gmp-5 ) elibc_glibc? ( threads? ( >=sys-libs/glibc-2.13 ) ) virtual/libffi
+SLOT=0/5.5.2
+SRC_URI=mirror://sourceforge/polyml/polyml.5.5.2.tar.gz
+_eclasses_=autotools	a9597abac7226d89ad9d010abeef6cfb	base	87f7447ccfc06fd0729ff4684e11e0d6	eutils	9fb270e417e0e83d64ca52586c4a79de	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	62927b3db3a589b0806255f3a002d5d3	pax-utils	dfe060cb70d89757fde5c1ff8405e950	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=a61a30ae3a7e0e4d5990284d6bdcf630
diff --git a/metadata/md5-cache/dev-python/google-apitools-0.4.8 b/metadata/md5-cache/dev-python/google-apitools-0.4.8
new file mode 100644
index 000000000000..03bb13a9860c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-apitools-0.4.8
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-1.4.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/protorpc-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apputils-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[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=utilities to make it easier to build client-side tools, especially ones that use Google APIs
+EAPI=5
+HOMEPAGE=https://github.com/google/apitools
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-1.4.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/protorpc-0.9.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apputils-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[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=https://github.com/google/apitools/archive/v0.4.8.tar.gz -> google-apitools-0.4.8.tar.gz
+_eclasses_=distutils-r1	8fd6db5e1c80bd7c6d640bce0413569e	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	ae9becb5d45344c01939c3f57df0d3fd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=1bc287e74202bf48313c0847cf752a68
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.5
new file mode 100644
index 000000000000..7d0bc3622876
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/atk test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby Atk bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=dev-libs/atk ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=c7f14a5c4865e17d042ea8321ea0a514
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.5
new file mode 100644
index 000000000000..5f5dae9c088b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/cairo test? ( ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby19] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rcairo[ruby_targets_ruby20] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby cairo-gobject bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc
+LICENSE=Ruby
+RDEPEND=x11-libs/cairo ruby_targets_ruby19? ( dev-ruby/rcairo[ruby_targets_ruby19] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/rcairo[ruby_targets_ruby20] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/rcairo[ruby_targets_ruby21] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/rcairo[ruby_targets_ruby22] >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=830d5ace693dd7b972b4a2affe5238c5
diff --git a/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.5
new file mode 100644
index 000000000000..d62092eedf7c
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-clutter-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=media-libs/clutter ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby Clutter bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc
+LICENSE=Ruby
+RDEPEND=media-libs/clutter ruby_targets_ruby19? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-cairo-gobject-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=c438f42261e6945b1ceea9e274a03299
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
index be3182dff632..e32703830867 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-2.2.3
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 )
 SLOT=0
 SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.3.tar.gz
 _eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
-_md5_=f899ce85d8c43b7b76df404a61d511d9
+_md5_=a315c5c9fbbd1e1d2385c7cbd8ec1020
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.5
new file mode 100644
index 000000000000..be8c2d81a375
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/gobject-introspection test? ( ruby_targets_ruby19? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby GObjectIntrospection bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc
+LICENSE=Ruby
+RDEPEND=dev-libs/gobject-introspection ruby_targets_ruby19? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=f317951248222f646fa72e490b444a8a
diff --git a/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.5
new file mode 100644
index 000000000000..58a6c7babbba
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gstreamer-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/gobject-introspection media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 test? ( ruby_targets_ruby19? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby GStreamer bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc
+LICENSE=Ruby
+RDEPEND=media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ruby_targets_ruby19? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( ~dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] ~dev-ruby/ruby-gobject-introspection-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=5c2318977054df601db33ce4ea255a67
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.5
new file mode 100644
index 000000000000..c08c7ba1ef63
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/gtk+:2 x11-themes/hicolor-icon-theme ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby22] ) ) test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby Gtk2 bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=x11-libs/gtk+:2 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby19] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby20] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby21] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-atk-2.2.5[ruby_targets_ruby22] >=dev-ruby/ruby-pango-2.2.5[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
+_md5_=7ce4f231c43f9960fad489a3bc5d56dd
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.5
new file mode 100644
index 000000000000..ab8e5c8a1500
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=x11-libs/pango-1.2.1 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby Pango bindings
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=>=x11-libs/pango-1.2.1 ruby_targets_ruby19? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby19] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby20] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby21] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-glib2-2.2.5[ruby_targets_ruby22] >=dev-ruby/rcairo-1.14.0[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=37b3797e642eeb65bc29b06869d881c7
diff --git a/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.5 b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.5
new file mode 100644
index 000000000000..1f01346cc978
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-rsvg-2.2.5
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=gnome-base/librsvg-2.8 test? ( ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby19] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) test? ( ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] ) ) virtual/pkgconfig ruby_targets_ruby19? ( dev-ruby/pkg-config[ruby_targets_ruby19] ) ruby_targets_ruby20? ( dev-ruby/pkg-config[ruby_targets_ruby20] ) ruby_targets_ruby21? ( dev-ruby/pkg-config[ruby_targets_ruby21] ) ruby_targets_ruby22? ( dev-ruby/pkg-config[ruby_targets_ruby22] )
+DESCRIPTION=Ruby bindings for librsvg
+EAPI=5
+HOMEPAGE=http://ruby-gnome2.sourceforge.jp/
+IUSE=test elibc_FreeBSD ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 test
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=Ruby
+RDEPEND=>=gnome-base/librsvg-2.8 ruby_targets_ruby19? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby19] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby19] ) ruby_targets_ruby20? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby20] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby20] ) ruby_targets_ruby21? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby21] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby21] ) ruby_targets_ruby22? ( >=dev-ruby/ruby-gdkpixbuf2-2.2.5[ruby_targets_ruby22] >=dev-ruby/rcairo-1.12.8[ruby_targets_ruby22] ) ruby_targets_ruby19? ( dev-lang/ruby:1.9 ) ruby_targets_ruby20? ( dev-lang/ruby:2.0 ) ruby_targets_ruby21? ( dev-lang/ruby:2.1 ) ruby_targets_ruby22? ( dev-lang/ruby:2.2 ) ruby_targets_ruby19? ( virtual/rubygems[ruby_targets_ruby19] ) ruby_targets_ruby20? ( virtual/rubygems[ruby_targets_ruby20] ) ruby_targets_ruby21? ( virtual/rubygems[ruby_targets_ruby21] ) ruby_targets_ruby22? ( virtual/rubygems[ruby_targets_ruby22] )
+REQUIRED_USE=|| ( ruby_targets_ruby19 ruby_targets_ruby20 ruby_targets_ruby21 ruby_targets_ruby22 )
+SLOT=0
+SRC_URI=mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-2.2.5.tar.gz
+_eclasses_=eutils	9fb270e417e0e83d64ca52586c4a79de	java-utils-2	8cdf065211fa6d6687bdc3f3ebe12efc	multilib	62927b3db3a589b0806255f3a002d5d3	ruby-fakegem	59aa129a3b9dc9e6225a0622860d2f54	ruby-ng	a1c75617b3482d513ad41d1aea8dbf8f	ruby-ng-gnome2	4463aca8669af6fafcca7f9f1f7fdbd5	ruby-utils	a74e21a353442acf697b6c82e7df6df8	toolchain-funcs	42408102d713fbad60ca21349865edb4	versionator	cd0bcdb170807e4a1984115e9d53a26f
+_md5_=34646523ac176ab76373c1b7c140fd35
diff --git a/metadata/md5-cache/net-misc/gsutil-4.13 b/metadata/md5-cache/net-misc/gsutil-4.13
new file mode 100644
index 000000000000..7a50e76caab8
--- /dev/null
+++ b/metadata/md5-cache/net-misc/gsutil-4.13
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=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(-)] >=dev-python/boto-2.38.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.4.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-1.4.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/protorpc-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/socksipy-1.01[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[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=command line tool for interacting with cloud storage services
+EAPI=5
+HOMEPAGE=https://github.com/GoogleCloudPlatform/gsutil
+IUSE=python_targets_python2_7
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=Apache-2.0
+RDEPEND=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(-)] >=dev-python/boto-2.38.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/crcmod-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/httplib2-0.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyopenssl-0.13[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/gcs-oauth2-boto-plugin-1.9[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/google-apitools-0.4.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/oauth2client-1.4.11[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/protorpc-0.10.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/python-gflags-2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/retry-decorator-1.0.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/six-1.8.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/socksipy-1.01[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=http://commondatastorage.googleapis.com/pub/gsutil_4.13.tar.gz
+_eclasses_=distutils-r1	8fd6db5e1c80bd7c6d640bce0413569e	eutils	9fb270e417e0e83d64ca52586c4a79de	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	62927b3db3a589b0806255f3a002d5d3	multiprocessing	d7f2985a2c76c365ee20269db5261414	python-r1	23846c6ba39f6655e2027001eeed8e81	python-utils-r1	ae9becb5d45344c01939c3f57df0d3fd	toolchain-funcs	42408102d713fbad60ca21349865edb4
+_md5_=db62236c50dfebed84769c7f2a0fc607
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index df6ded5897cf..8632c3d716f9 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Thu, 09 Jul 2015 09:36:53 +0000
+Thu, 09 Jul 2015 13:06:56 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index ab6430ef569b..9c0dfdfeeb29 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Thu Jul  9 09:36:50 UTC 2015
+Thu Jul  9 13:06:52 UTC 2015
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9ef343f18ee6..12d0812dea3d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Thu, 09 Jul 2015 10:00:01 +0000
+Thu, 09 Jul 2015 13:30:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 7d82c3a03fd9..673bbf3b11fc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1436434501 Thu 09 Jul 2015 09:35:01 AM UTC
+1436447101 Thu 09 Jul 2015 01:05:01 PM UTC
diff --git a/net-misc/gsutil/Manifest b/net-misc/gsutil/Manifest
index a6477e4dafdd..a44edba305c2 100644
--- a/net-misc/gsutil/Manifest
+++ b/net-misc/gsutil/Manifest
@@ -7,6 +7,7 @@ DIST gsutil_3.42.tar.gz 1878904 SHA256 50fc7acb7d1db8752f3eee106a3d8d65188107943
 DIST gsutil_3.7.tar.gz 673203 SHA256 77907865287e57a8ce713e97155191bd44448d6888861a45345d9b035a3b3b87 SHA512 771fbe6f095955a14565ca50704a8a5b674935f0992564491e2a0e57f1a14e26f44f4379ed2b6160a7fe9f34299f405c22402d86d8a9042baa886dd8b7389cd3 WHIRLPOOL dd353f1e7ecc3262fc17463610e80b2f89c928d67490dfd5eaf99977ff5c578bbaaf1f6408de19c7c72e5ed88d7185549dbe2415ef021bf109860857ad419aef
 DIST gsutil_4.11.tar.gz 2137641 SHA256 4a9e538eb8461ad8ece4ac0dcf67b26b6a357456ffca6778f3612954710c3a3b SHA512 3b43e08a96962f5544fb5151ed8d81de12ecdec277a257c78f0fe230d1cee45ed170d4d0e58787b320e25ecc622a413b596954720cc573a1adf008fe039ed8a9 WHIRLPOOL 7ff6176c840a8e3c301f021f154c3a28cca1336681ead741d3c4eedcf6d6efed3762f2ab127026d27103a2f3e6bb5d8af7e23d2abc55859104e5653c39aa0d56
 DIST gsutil_4.12.tar.gz 2602559 SHA256 f08dff664ad2a8875dca9d2a64384a1eba5e391dc4e8cde9189e9394e7156d8e SHA512 3d651e2f40b1842f6855557119da911d519921c6e96ac6368a7aff7414db9332b72331f9fc479c25c1c26307ae08f1dbc9ac683badd79ee88b41fa881c1b4573 WHIRLPOOL d8e02b146e94a3fee1c91077f5d3eef5510628299f6fdefc36c1b4337f55a2cd10f3b16c4a4e7058ae598412c7cb73855b18ca1be5ebda201a042f7040696164
+DIST gsutil_4.13.tar.gz 2790817 SHA256 f6fa8a77ff0475ba4898b2a4453ed3ead551499485000420f12bc4f7cfbcc09e SHA512 b146c8ce6fba09b07a752842d1ca3f83c74250553a4dae50ce32bf8ece2ded366e1b60d5c0af3727e2f5ed8d0766c9345bbf1056c3af571a26d2ed76187b57c9 WHIRLPOOL 5a989c51a9e550523713dc658255036a044f0e88dfd3869ca362d573bae6ff83004bb3249674b15fe6082b666d3c598a6f133c9b2e3c7e373a20f5db54b6d361
 DIST gsutil_4.4.tar.gz 2165629 SHA256 aa1e906d46ef04a6a2c65b38ce95b96575c7640377d52e41de9cfb9ac4bb9b87 SHA512 a3a72e4159010af497941c1073af561615ff6e8ca58f387378c5f6d599f2c75b1b9f855066ff65640ef303aace5de3dfffad53378dfe31a3911e1fdeddeef672 WHIRLPOOL eb8b5dc528b5d54a7fab4812aa73da819eba1b3f16f5a01a2bd6c139215f99aac0fe6a4f49e1a02733d17a94c2595d0b1fa7a652cc2baf50121549c2374df0be
 DIST gsutil_4.5.tar.gz 2196988 SHA256 ab8dd64754be902a41dc696f2d186dcf232ef959b40e24bf56fd6ae2940ed822 SHA512 a8e1ac6f6aa47727cb90f335253f0a8f0c4a04631695c1be63c1276f0202a71770c8046039baaf5fa4b31100a8f85073ea9cf5e283b41902d9ef58f84704bfc8 WHIRLPOOL d7d8c3078722aa692369d288c9621754d6df6f0aa70eb6608cac75fd21c9825c577dbeef64f1615dbace2f6ac7e1167a820c0047aa732c1cdf8bde6462fd0c15
 DIST gsutil_4.6.tar.gz 2201289 SHA256 ba811fe4dd55a138cdc7ce41622aff5bc9f93503b012ea3abb47bc7524004db7 SHA512 66699451b6b6c030ed553b364565f1837caa252c7924c7184af695b215bbc3c1bb0d7893f18cf6ae1d8c2b466bb1a28bcc31fd908d867852832b4aa4409dfc49 WHIRLPOOL 59e179bd94a4c80f0223ceb76ffb1eaf5fcef445f6e9039c01024c49db5342ded90ab0e87f81df403f6f0f5a873bf7c362f4df594cf53d02668bbcdb7ff1c331
diff --git a/net-misc/gsutil/files/gsutil-4.13-use-friendy-version-checks.patch b/net-misc/gsutil/files/gsutil-4.13-use-friendy-version-checks.patch
new file mode 100644
index 000000000000..fef0858c3fea
--- /dev/null
+++ b/net-misc/gsutil/files/gsutil-4.13-use-friendy-version-checks.patch
@@ -0,0 +1,24 @@
+--- a/setup.py
++++ b/setup.py
+@@ -35,10 +35,10 @@
+ """
+ 
+ requires = [
+-    'boto==2.38.0',
++    'boto>=2.38.0',
+     'crcmod>=1.7',
+     'gcs-oauth2-boto-plugin>=1.9',
+-    'google-apitools==0.4.8',
++    'google-apitools>=0.4.8',
+     'httplib2>=0.8',
+     'oauth2client>=1.4.11',
+     'protorpc>=0.10.0',
+@@ -48,7 +48,7 @@
+     'six>=1.8.0',
+     # Not using 1.02 because of:
+     #   https://code.google.com/p/socksipy-branch/issues/detail?id=3
+-    'SocksiPy-branch==1.01',
++    'SocksiPy-branch>=1.01',
+ ]
+ 
+ dependency_links = [
diff --git a/net-misc/gsutil/gsutil-4.13.ebuild b/net-misc/gsutil/gsutil-4.13.ebuild
new file mode 100644
index 000000000000..62a177f7f530
--- /dev/null
+++ b/net-misc/gsutil/gsutil-4.13.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-misc/gsutil/gsutil-4.13.ebuild,v 1.1 2015/07/09 10:26:42 vapier Exp $
+
+EAPI="5"
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="command line tool for interacting with cloud storage services"
+HOMEPAGE="https://github.com/GoogleCloudPlatform/gsutil"
+SRC_URI="http://commondatastorage.googleapis.com/pub/${PN}_${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE=""
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-python/boto-2.38.0[${PYTHON_USEDEP}]
+	>=dev-python/crcmod-1.7[${PYTHON_USEDEP}]
+	>=dev-python/httplib2-0.8[${PYTHON_USEDEP}]
+	>=dev-python/pyopenssl-0.13[${PYTHON_USEDEP}]
+	>=dev-python/gcs-oauth2-boto-plugin-1.9[${PYTHON_USEDEP}]
+	>=dev-python/google-apitools-0.4.8[${PYTHON_USEDEP}]
+	>=dev-python/oauth2client-1.4.11[${PYTHON_USEDEP}]
+	>=dev-python/protorpc-0.10.0[${PYTHON_USEDEP}]
+	>=dev-python/python-gflags-2.0[${PYTHON_USEDEP}]
+	>=dev-python/retry-decorator-1.0.0[${PYTHON_USEDEP}]
+	>=dev-python/six-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/socksipy-1.01[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+
+S=${WORKDIR}/${PN}
+
+DOCS=( README.md CHANGES.md )
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.13-use-friendy-version-checks.patch"
+)
+
+python_test() {
+	export BOTO_CONFIG=${FILESDIR}/dummy.boto
+	${PYTHON} gslib/__main__.py test -u || die "tests failed"
+}