diff --git a/metadata/md5-cache/sys-libs/gdbm-1.11 b/metadata/md5-cache/sys-libs/gdbm-1.11
new file mode 100644
index 0000000..d3c7424
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/gdbm-1.11
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile configure install postinst preinst prepare test
+DESCRIPTION=Standard GNU database libraries
+EAPI=4
+HOMEPAGE=http://www.gnu.org/software/gdbm/
+IUSE=+berkdb exporter nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=*
+LICENSE=GPL-3
+RDEPEND=abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20131008-r4 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=mirror://gnu/gdbm/gdbm-1.11.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	c3131dc67d3bd39f044e92b8280505e4	libtool	eba09ed440f2692f73024ff3621a1f4b	multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multilib-minimal	5bbdc77877c1aa3c6bd89ca3f9196d11	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=eff0ffc633009d430773ddf968fce42f
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.9.1-r2 b/metadata/md5-cache/sys-libs/gdbm-1.9.1-r2
deleted file mode 100644
index c068881..0000000
--- a/metadata/md5-cache/sys-libs/gdbm-1.9.1-r2
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare
-DESCRIPTION=Standard GNU database libraries
-EAPI=3
-HOMEPAGE=http://www.gnu.org/software/gdbm/
-IUSE=+berkdb exporter static-libs
-KEYWORDS=*
-LICENSE=GPL-3
-SLOT=0
-SRC_URI=mirror://gnu/gdbm/gdbm-1.9.1.tar.gz exporter? ( mirror://gnu/gdbm/gdbm-1.8.3.tar.gz )
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	flag-o-matic	c3131dc67d3bd39f044e92b8280505e4	libtool	eba09ed440f2692f73024ff3621a1f4b	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1b5cf7583c335999258698beab992ebe
diff --git a/metadata/md5-cache/virtual/libintl-0 b/metadata/md5-cache/virtual/libintl-0
deleted file mode 100644
index 4f8791e..0000000
--- a/metadata/md5-cache/virtual/libintl-0
+++ /dev/null
@@ -1,6 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for the GNU Internationalization Library
-KEYWORDS=*
-RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( sys-devel/gettext ) )
-SLOT=0
-_md5_=7701f91803895206ef8a1baa82c0f040
diff --git a/metadata/md5-cache/virtual/libintl-0-r1 b/metadata/md5-cache/virtual/libintl-0-r1
new file mode 100644
index 0000000..8d2def1
--- /dev/null
+++ b/metadata/md5-cache/virtual/libintl-0-r1
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual for the GNU Internationalization Library
+EAPI=4
+IUSE=elibc_glibc elibc_uclibc abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=*
+RDEPEND=!elibc_glibc? ( !elibc_uclibc? ( !elibc_musl? ( >=sys-devel/gettext-0.18.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_ppc_32(-)?,abi_ppc_64(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) )
+SLOT=0
+_eclasses_=multibuild	46527a4656956da3d58acff72c9b59b1	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	9eb4b5fb858228316d8bb32ada51f6a5	multiprocessing	d7f2985a2c76c365ee20269db5261414	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=50bd817f2a40909648f4361bfb3f81ca