diff --git a/metadata/md5-cache/media-libs/jpeg-8b b/metadata/md5-cache/media-libs/jpeg-8b
deleted file mode 100644
index af07ca4..0000000
--- a/metadata/md5-cache/media-libs/jpeg-8b
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare unpack
-DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
-EAPI=3
-HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
-IUSE=static-libs
-KEYWORDS=*
-LICENSE=as-is
-SLOT=0
-SRC_URI=http://www.ijg.org/files/jpegsrc.v8b.tar.gz mirror://debian/pool/main/libj/libjpeg7/libjpeg7_7-1.diff.gz
-_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
-_md5_=1eba8c25d80f252ec1d9092b7238c1f6
diff --git a/metadata/md5-cache/media-libs/jpeg-9a b/metadata/md5-cache/media-libs/jpeg-9a
new file mode 100644
index 0000000..6480581
--- /dev/null
+++ b/metadata/md5-cache/media-libs/jpeg-9a
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=!media-libs/libjpeg-turbo:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+DESCRIPTION=Library to load, handle and manipulate images in the JPEG format
+EAPI=5
+HOMEPAGE=http://jpegclub.org/ http://www.ijg.org/
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=*
+LICENSE=IJG
+RDEPEND=!media-libs/libjpeg-turbo:0 abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20130224-r5 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
+SLOT=0
+SRC_URI=http://www.ijg.org/files/jpegsrc.v9a.tar.gz mirror://debian/pool/main/libj/libjpeg8/libjpeg8_8d-1.debian.tar.gz
+_eclasses_=eutils	06133990e861be0fe60c2b428fd025d9	libtool	52d0e17251d04645ffaa61bfdd858944	multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	multilib-minimal	13dd976916c35a1e2c8d170e840c7018	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=9962fc04eec05646d1c78bc8391c8a7d
diff --git a/metadata/md5-cache/virtual/jpeg-0 b/metadata/md5-cache/virtual/jpeg-0
deleted file mode 100644
index 08f8ec4..0000000
--- a/metadata/md5-cache/virtual/jpeg-0
+++ /dev/null
@@ -1,8 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual for jpeg library
-EAPI=2
-IUSE=static-libs
-KEYWORDS=*
-RDEPEND=|| ( media-libs/libjpeg-turbo:0[static-libs?] media-libs/jpeg:0[static-libs?] )
-SLOT=0
-_md5_=327f93d9b33847cc003f5dae9025f80e
diff --git a/metadata/md5-cache/virtual/jpeg-0-r2 b/metadata/md5-cache/virtual/jpeg-0-r2
new file mode 100644
index 0000000..3e329f7
--- /dev/null
+++ b/metadata/md5-cache/virtual/jpeg-0-r2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for selecting between libjpeg-turbo and IJG jpeg for source-based packages
+EAPI=5
+IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
+KEYWORDS=*
+RDEPEND=|| ( >=media-libs/libjpeg-turbo-1.3.0-r2:0[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(-)?] >=media-libs/jpeg-8d-r1:0[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(-)?] )
+SLOT=0
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=78c4187e1bdf6ab6c9b2ed905693312e
diff --git a/metadata/md5-cache/virtual/jpeg-62 b/metadata/md5-cache/virtual/jpeg-62
new file mode 100644
index 0000000..3b650b4
--- /dev/null
+++ b/metadata/md5-cache/virtual/jpeg-62
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=A virtual for the libjpeg.so.62 ABI for binary-only programs
+EAPI=5
+IUSE=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=|| ( >=media-libs/libjpeg-turbo-1.3.0-r2:0[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(-)?] media-libs/jpeg:62[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=62
+_eclasses_=multibuild	6d4858dc00f8bc51caf3f957f8430eb0	multilib	3bf24e6abb9b76d9f6c20600f0b716bf	multilib-build	0983c7893df461213a05f791cc7dea6d	toolchain-funcs	48b38a216afb92db6314d6c3187abea3
+_md5_=471e2d15da331b991a8b2b78c25154aa