15 files changed, 55 insertions, 62 deletions
diff --git a/metadata/md5-cache/app-misc/ledit-2.03 b/metadata/md5-cache/app-misc/ledit-2.03
index 78059551830f..b1e9b27a59e1 100644
--- a/metadata/md5-cache/app-misc/ledit-2.03
+++ b/metadata/md5-cache/app-misc/ledit-2.03
@@ -7,8 +7,8 @@ IUSE=+ocamlopt
 KEYWORDS=amd64 ppc x86
 LICENSE=BSD
 RDEPEND=>=dev-lang/ocaml-3.09:=[ocamlopt?] dev-ml/camlp5:=
-RESTRICT=!ocamlopt? ( strip )
+RESTRICT=installsources !ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://pauillac.inria.fr/~ddr/ledit/distrib/src/ledit-2.03.tgz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=be26d56b5bccca508da32e745dbcbed5
+_md5_=d815917928d3eb9ce49ac65a21668dfe
diff --git a/metadata/md5-cache/dev-util/omake-0.10.2 b/metadata/md5-cache/dev-util/omake-0.10.2
index ed6969ec4e91..0c33295bb90e 100644
--- a/metadata/md5-cache/dev-util/omake-0.10.2
+++ b/metadata/md5-cache/dev-util/omake-0.10.2
@@ -7,8 +7,8 @@ IUSE=doc fam ncurses +ocamlopt readline
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
-RESTRICT=!ocamlopt? ( strip )
+RESTRICT=installsources !ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/omake-0.10.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=de92a51e2a3fd862cfa6fbf7c2add414
+_md5_=f1149adbea675543e6050804e3a2d021
diff --git a/metadata/md5-cache/dev-util/omake-0.10.3 b/metadata/md5-cache/dev-util/omake-0.10.3
index 37639319bf4d..eff446b8dc4a 100644
--- a/metadata/md5-cache/dev-util/omake-0.10.3
+++ b/metadata/md5-cache/dev-util/omake-0.10.3
@@ -7,8 +7,8 @@ IUSE=doc fam ncurses +ocamlopt readline
 KEYWORDS=~amd64 ~ppc ~x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
-RESTRICT=!ocamlopt? ( strip )
+RESTRICT=installsources !ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://download.camlcity.org/download/omake-0.10.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=353e19b70cb54cda1a63cc43a3fc6a09
+_md5_=61ac190dd85f6621edca9ded3b9dec6f
diff --git a/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1 b/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
index 0fd815d54537..55f422d690bd 100644
--- a/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
+++ b/metadata/md5-cache/dev-util/omake-0.9.8.6.0_rc1
@@ -7,8 +7,8 @@ IUSE=doc fam ncurses +ocamlopt readline
 KEYWORDS=~amd64 ppc x86
 LICENSE=GPL-2
 RDEPEND=>=dev-lang/ocaml-3.10.2:=[ocamlopt?] ncurses? ( >=sys-libs/ncurses-5.3:0= ) fam? ( virtual/fam ) readline? ( >=sys-libs/readline-4.3:0= )
-RESTRICT=!ocamlopt? ( strip )
+RESTRICT=installsources !ocamlopt? ( strip )
 SLOT=0
 SRC_URI=http://omake.metaprl.org/downloads/omake-0.9.8.6-0.rc1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	2352c3fc97241f6a02042773c8287748
-_md5_=68312b689c8b3be6ecd52d4c768a713d
+_md5_=73afa43ce923784ab6ea4ddba4cfade2
diff --git a/metadata/md5-cache/media-gfx/aview-1.3.0_rc1-r3 b/metadata/md5-cache/media-gfx/aview-1.3.0_rc1-r3
index dd13d451f8f2..17a065b3150b 100644
--- a/metadata/md5-cache/media-gfx/aview-1.3.0_rc1-r3
+++ b/metadata/md5-cache/media-gfx/aview-1.3.0_rc1-r3
@@ -1,12 +1,13 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=>=media-libs/aalib-1.4_rc4
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=prepare
+DEPEND=media-libs/aalib:=
 DESCRIPTION=An ASCII Image Viewer
-EAPI=4
+EAPI=7
 HOMEPAGE=http://aa-project.sourceforge.net/aview/
 KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-solaris
 LICENSE=GPL-2
-RDEPEND=>=media-libs/aalib-1.4_rc4
+RDEPEND=media-libs/aalib:=
 SLOT=0
 SRC_URI=mirror://sourceforge/aa-project/aview-1.3.0rc1.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8f39afd192124df829cdaf3545e87f8a
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=fd66e502e4b7c4ca56530c59c9750c2c
diff --git a/metadata/md5-cache/media-gfx/crwinfo-0.2 b/metadata/md5-cache/media-gfx/crwinfo-0.2
index bae2877763cc..ed22e1d6b5e6 100644
--- a/metadata/md5-cache/media-gfx/crwinfo-0.2
+++ b/metadata/md5-cache/media-gfx/crwinfo-0.2
@@ -1,10 +1,10 @@
-DEFINED_PHASES=install prepare
+DEFINED_PHASES=compile install
 DESCRIPTION=Canon raw image (CRW) information and thumbnail extractor
-EAPI=4
+EAPI=7
 HOMEPAGE=http://freshmeat.net/projects/crwinfo/
 KEYWORDS=alpha amd64 hppa ia64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://neuemuenze.heim1.tu-clausthal.de/~sven/crwinfo/CRWInfo-0.2.tar.gz
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1b616c05e95adca890456080ea6373d8
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=b29e3da1430ae671179de011c7f06506
diff --git a/metadata/md5-cache/media-gfx/gphotofs-0.5 b/metadata/md5-cache/media-gfx/gphotofs-0.5
deleted file mode 100644
index 26af8ecf3f8c..000000000000
--- a/metadata/md5-cache/media-gfx/gphotofs-0.5
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=-
-DEPEND=>=media-libs/libgphoto2-2.5.0 >=sys-fs/fuse-2.5 >=dev-libs/glib-2.6 virtual/pkgconfig >=sys-devel/gettext-0.14.1
-DESCRIPTION=FUSE file system for interfacing with digital cameras using gphoto2
-EAPI=4
-HOMEPAGE=http://www.gphoto.org/
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=>=media-libs/libgphoto2-2.5.0 >=sys-fs/fuse-2.5 >=dev-libs/glib-2.6
-SLOT=0
-SRC_URI=mirror://sourceforge/gphoto/gphotofs-0.5.tar.bz2
-_md5_=f38826fb83f7ec106001253c8b49d805
diff --git a/metadata/md5-cache/media-gfx/gphotofs-0.5-r1 b/metadata/md5-cache/media-gfx/gphotofs-0.5-r1
index 6d81a571c9a7..32347513a99b 100644
--- a/metadata/md5-cache/media-gfx/gphotofs-0.5-r1
+++ b/metadata/md5-cache/media-gfx/gphotofs-0.5-r1
@@ -1,12 +1,12 @@
-BDEPEND=virtual/pkgconfig >=sys-devel/gettext-0.14.1
+BDEPEND=sys-devel/gettext virtual/pkgconfig
 DEFINED_PHASES=-
-DEPEND=>=media-libs/libgphoto2-2.5.0 >=sys-fs/fuse-2.5:0 >=dev-libs/glib-2.6
+DEPEND=dev-libs/glib:2 media-libs/libgphoto2:= sys-fs/fuse:0=
 DESCRIPTION=FUSE file system for interfacing with digital cameras using gphoto2
 EAPI=7
 HOMEPAGE=http://www.gphoto.org/
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libgphoto2-2.5.0 >=sys-fs/fuse-2.5:0 >=dev-libs/glib-2.6
+RDEPEND=dev-libs/glib:2 media-libs/libgphoto2:= sys-fs/fuse:0=
 SLOT=0
 SRC_URI=mirror://sourceforge/gphoto/gphotofs-0.5.tar.bz2
-_md5_=4d1f09e1835bf935df351265ca36c1ef
+_md5_=114e7a655eb9b2143a8237187e0216d1
diff --git a/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1 b/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
index af108e6385a7..bd346a12ca85 100644
--- a/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
+++ b/metadata/md5-cache/media-gfx/hp2xx-3.4.4-r1
@@ -1,13 +1,14 @@
-DEFINED_PHASES=compile configure install prepare unpack
-DEPEND=png? ( media-libs/libpng sys-libs/zlib ) tiff? ( media-libs/tiff ) jpeg? ( virtual/jpeg ) X? ( x11-libs/libX11 ) sys-apps/texinfo
+BDEPEND=sys-apps/texinfo
+DEFINED_PHASES=compile configure install prepare
+DEPEND=jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= sys-libs/zlib ) tiff? ( media-libs/tiff:= ) X? ( x11-libs/libX11 )
 DESCRIPTION=Convert Hewlett-Packard's HP-GL plotter language to other graphics formats
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.gnu.org/software/hp2xx/
-IUSE=X jpeg png tiff
+IUSE=jpeg png tiff X
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=png? ( media-libs/libpng sys-libs/zlib ) tiff? ( media-libs/tiff ) jpeg? ( virtual/jpeg ) X? ( x11-libs/libX11 )
+RDEPEND=jpeg? ( virtual/jpeg ) png? ( media-libs/libpng:= sys-libs/zlib ) tiff? ( media-libs/tiff:= ) X? ( x11-libs/libX11 )
 SLOT=0
 SRC_URI=mirror://gnu/hp2xx/hp2xx-3.4.4.tar.gz
-_eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9d6dbda07931d1fc3d98c7d87e1f75ee
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=8b89aef1b6dc1e69557abc2dfc99c66d
diff --git a/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1 b/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
index 82a3fa31149d..47747e06bbd6 100644
--- a/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
+++ b/metadata/md5-cache/media-gfx/pngtoico-1.0.1-r1
@@ -1,12 +1,12 @@
-DEFINED_PHASES=compile install prepare
-DEPEND=>=media-libs/libpng-1.4
+DEFINED_PHASES=configure install
+DEPEND=media-libs/libpng:=
 DESCRIPTION=Convert png images to MS ico format
-EAPI=4
+EAPI=7
 HOMEPAGE=https://www.kernel.org/pub/software/graphics/pngtoico/
 KEYWORDS=amd64 ~ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4
+RDEPEND=media-libs/libpng:=
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/software/graphics/pngtoico/pngtoico-1.0.1.tar.bz2
-_eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=01825601289962ae2f177e0d5d751a65
+_eclasses_=multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=bf5031fe2fab746522e70c51d2f6c9ce
diff --git a/metadata/md5-cache/media-gfx/pngtools-0.4-r2 b/metadata/md5-cache/media-gfx/pngtools-0.4-r2
index 6766f2f0f2e5..ba280fff1676 100644
--- a/metadata/md5-cache/media-gfx/pngtools-0.4-r2
+++ b/metadata/md5-cache/media-gfx/pngtools-0.4-r2
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libpng-1.4:0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libpng:=
 DESCRIPTION=A series of tools for the PNG image format
-EAPI=4
+EAPI=7
 HOMEPAGE=http://www.stillhq.com/pngtools/
 KEYWORDS=amd64 ppc x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.4:0
+RDEPEND=media-libs/libpng:=
 SLOT=0
 SRC_URI=http://www.stillhq.com/pngtools/source/pngtools_0_4.tgz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=2adc799d978f85d52490a62b8ea504b1
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=100765377b344c9eb680faf6322d440b
diff --git a/metadata/md5-cache/media-gfx/tif22pnm-0.14 b/metadata/md5-cache/media-gfx/tif22pnm-0.14
index 084d81169901..07c06cb7ea83 100644
--- a/metadata/md5-cache/media-gfx/tif22pnm-0.14
+++ b/metadata/md5-cache/media-gfx/tif22pnm-0.14
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
 DEFINED_PHASES=install prepare
-DEPEND=>=media-libs/libpng-1.2:0 media-libs/tiff:0 >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEPEND=media-libs/libpng:0= media-libs/tiff:0=
 DESCRIPTION=tif22pnm and png22pnm command-line converters
-EAPI=4
+EAPI=7
 HOMEPAGE=http://pts.szit.bme.hu/ https://code.google.com/p/sam2p/
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=>=media-libs/libpng-1.2:0 media-libs/tiff:0
+RDEPEND=media-libs/libpng:0= media-libs/tiff:0=
 SLOT=0
 SRC_URI=https://sam2p.googlecode.com/files/tif22pnm-0.14.tar.gz
-_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	flag-o-matic	8a43b9830f1e64a7a5fc0a276afa0275	libtool	f143db5a74ccd9ca28c1234deffede96	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=74f753572317c6794a8939b547a231d9
+_eclasses_=autotools	ea7865c8fba1ea8d3639f355fffe1a3c	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c
+_md5_=0c32af2be3c46484e4123e29dec2b21c
diff --git a/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r6 b/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r6
index 5d727c4add1c..5b18095b2da6 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r6
+++ b/metadata/md5-cache/net-analyzer/metasploit-4.17.21-r6
@@ -8,8 +8,8 @@ KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
 RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby24] dev-ruby/backports[ruby_targets_ruby24] dev-ruby/bcrypt-ruby[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] dev-ruby/bit-struct[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/dnsruby[ruby_targets_ruby24] dev-ruby/faker:0[ruby_targets_ruby24] dev-ruby/faraday[ruby_targets_ruby24] dev-ruby/filesize:*[ruby_targets_ruby24] dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/metasploit-concern[ruby_targets_ruby24] <dev-ruby/metasploit-credential-3.0.0[ruby_targets_ruby24] <dev-ruby/metasploit_data_models-3.0.0[ruby_targets_ruby24] dev-ruby/metasploit-model[ruby_targets_ruby24] dev-ruby/metasploit-payloads:1.3.53[ruby_targets_ruby24] dev-ruby/metasploit_payloads-mettle:0.4.2[ruby_targets_ruby24] dev-ruby/mqtt[ruby_targets_ruby24] dev-ruby/msgpack[ruby_targets_ruby24] dev-ruby/net-ssh:*[ruby_targets_ruby24] dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/octokit[ruby_targets_ruby24] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby24] dev-ruby/packetfu:1.1.13[ruby_targets_ruby24] dev-ruby/patch_finder[ruby_targets_ruby24] dev-ruby/pdf-reader:*[ruby_targets_ruby24] ~dev-ruby/pg-0.21.0[ruby_targets_ruby24] dev-ruby/railties:*[ruby_targets_ruby24] dev-ruby/rb-readline[ruby_targets_ruby24] dev-ruby/recog:*[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-bin_tools[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-exploitation[ruby_targets_ruby24] dev-ruby/rex-java[ruby_targets_ruby24] dev-ruby/rex-mime[ruby_targets_ruby24] dev-ruby/rex-nop[ruby_targets_ruby24] dev-ruby/rex-ole[ruby_targets_ruby24] <dev-ruby/rex-powershell-0.1.78[ruby_targets_ruby24] dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-registry[ruby_targets_ruby24] dev-ruby/rex-rop_builder[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-sslscan[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] dev-ruby/rex-zip[ruby_targets_ruby24] dev-ruby/ruby-macho[ruby_targets_ruby24] dev-ruby/rubyntlm[ruby_targets_ruby24] dev-ruby/ruby_smb:*[ruby_targets_ruby24] dev-ruby/rubyzip:*[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/sshkey[ruby_targets_ruby24] dev-ruby/tzinfo:*[ruby_targets_ruby24] dev-ruby/windows_error[ruby_targets_ruby24] dev-ruby/xdr:2.0.0[ruby_targets_ruby24] dev-ruby/xmlrpc[ruby_targets_ruby24] java? ( dev-ruby/rjb[ruby_targets_ruby24] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby24] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby24] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby24] dev-ruby/network_interface[ruby_targets_ruby24] ) development? ( dev-ruby/fivemat[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby24] ) ) dev-db/postgresql[server] || ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] ) net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
-RESTRICT=test !test? ( test ) strip
+RESTRICT=strip test !test? ( test )
 SLOT=4.17
 SRC_URI=https://github.com/rapid7/metasploit-framework/archive/4.17.21.tar.gz -> metasploit-4.17.21.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=8219f62c6f7c4f68ae31dd7ed3b9b19d
+_md5_=bb41068418113b0a4a09886826637200
diff --git a/metadata/md5-cache/net-analyzer/metasploit-9999 b/metadata/md5-cache/net-analyzer/metasploit-9999
index a2b933ca27a5..6046a638deae 100644
--- a/metadata/md5-cache/net-analyzer/metasploit-9999
+++ b/metadata/md5-cache/net-analyzer/metasploit-9999
@@ -8,7 +8,7 @@ LICENSE=BSD
 PROPERTIES=live
 RDEPEND=ruby_targets_ruby24? ( virtual/ruby-ssl[ruby_targets_ruby24] >=dev-ruby/actionpack-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activerecord-4.2.6:4.2[ruby_targets_ruby24] >=dev-ruby/activesupport-4.2.6:4.2[ruby_targets_ruby24] dev-ruby/backports[ruby_targets_ruby24] dev-ruby/bcrypt-ruby[ruby_targets_ruby24] dev-ruby/bcrypt_pbkdf[ruby_targets_ruby24] dev-ruby/bit-struct[ruby_targets_ruby24] dev-ruby/bundler[ruby_targets_ruby24] dev-ruby/dnsruby[ruby_targets_ruby24] dev-ruby/faker:0[ruby_targets_ruby24] dev-ruby/filesize:*[ruby_targets_ruby24] dev-ruby/jsobfu:*[ruby_targets_ruby24] dev-ruby/json:*[ruby_targets_ruby24] dev-ruby/metasm:*[ruby_targets_ruby24] dev-ruby/metasploit-concern[ruby_targets_ruby24] <dev-ruby/metasploit-credential-3.0.0[ruby_targets_ruby24] <dev-ruby/metasploit_data_models-3.0.0[ruby_targets_ruby24] dev-ruby/metasploit-model[ruby_targets_ruby24] dev-ruby/metasploit-payloads:1.3.53[ruby_targets_ruby24] dev-ruby/metasploit_payloads-mettle:0.4.2[ruby_targets_ruby24] dev-ruby/mqtt[ruby_targets_ruby24] dev-ruby/msgpack[ruby_targets_ruby24] dev-ruby/net-ssh:*[ruby_targets_ruby24] dev-ruby/ed25519[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/octokit[ruby_targets_ruby24] dev-ruby/openssl-ccm:1.2.1[ruby_targets_ruby24] dev-ruby/packetfu:1.1.13[ruby_targets_ruby24] dev-ruby/patch_finder[ruby_targets_ruby24] dev-ruby/pdf-reader:*[ruby_targets_ruby24] ~dev-ruby/pg-0.21.0[ruby_targets_ruby24] dev-ruby/railties:*[ruby_targets_ruby24] dev-ruby/rb-readline[ruby_targets_ruby24] dev-ruby/recog:*[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/rex-arch[ruby_targets_ruby24] dev-ruby/rex-bin_tools[ruby_targets_ruby24] dev-ruby/rex-core[ruby_targets_ruby24] dev-ruby/rex-encoder[ruby_targets_ruby24] dev-ruby/rex-exploitation[ruby_targets_ruby24] dev-ruby/rex-java[ruby_targets_ruby24] dev-ruby/rex-mime[ruby_targets_ruby24] dev-ruby/rex-nop[ruby_targets_ruby24] dev-ruby/rex-ole[ruby_targets_ruby24] <dev-ruby/rex-powershell-0.1.78[ruby_targets_ruby24] dev-ruby/rex-random_identifier[ruby_targets_ruby24] dev-ruby/rex-registry[ruby_targets_ruby24] dev-ruby/rex-rop_builder[ruby_targets_ruby24] dev-ruby/rex-socket[ruby_targets_ruby24] dev-ruby/rex-sslscan[ruby_targets_ruby24] dev-ruby/rex-struct2[ruby_targets_ruby24] dev-ruby/rex-text[ruby_targets_ruby24] dev-ruby/rex-zip[ruby_targets_ruby24] dev-ruby/ruby-macho[ruby_targets_ruby24] dev-ruby/rubyntlm[ruby_targets_ruby24] dev-ruby/ruby_smb:*[ruby_targets_ruby24] dev-ruby/rubyzip:*[ruby_targets_ruby24] dev-ruby/sqlite3[ruby_targets_ruby24] dev-ruby/sshkey[ruby_targets_ruby24] dev-ruby/tzinfo:*[ruby_targets_ruby24] dev-ruby/windows_error[ruby_targets_ruby24] dev-ruby/xdr:2.0.0[ruby_targets_ruby24] dev-ruby/xmlrpc[ruby_targets_ruby24] java? ( dev-ruby/rjb[ruby_targets_ruby24] ) nexpose? ( dev-ruby/nexpose[ruby_targets_ruby24] ) oracle? ( dev-ruby/ruby-oci8[ruby_targets_ruby24] ) pcap? ( dev-ruby/pcaprub:*[ruby_targets_ruby24] dev-ruby/network_interface[ruby_targets_ruby24] ) development? ( dev-ruby/fivemat[ruby_targets_ruby24] dev-ruby/pry[ruby_targets_ruby24] dev-ruby/redcarpet[ruby_targets_ruby24] dev-ruby/yard[ruby_targets_ruby24] >=dev-ruby/rake-10.0.0[ruby_targets_ruby24] >=dev-ruby/factory_girl-4.1.0[ruby_targets_ruby24] ) ) dev-db/postgresql[server] || ( app-crypt/johntheripper-jumbo >=app-crypt/johntheripper-1.7.9-r1[-minimal(-)] ) net-analyzer/nmap >=app-eselect/eselect-metasploit-0.16 ruby_targets_ruby24? ( dev-lang/ruby:2.4 )
 REQUIRED_USE=|| ( ruby_targets_ruby24 )
-RESTRICT=test !test? ( test ) strip
+RESTRICT=strip test !test? ( test )
 SLOT=9999
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	686eaab303305a908fd57b2fd7617800	eutils	fcb2aa98e1948b835b5ae66ca52868c5	git-r3	6d22636df236df4cc8475f7b7668bdcd	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	preserve-libs	ef207dc62baddfddfd39a164d9797648	ruby-ng	5ad91e467b477000267afdeea4a7093e	ruby-utils	5b782a86f95c84466cdb53f8c8a8be37	toolchain-funcs	512eb3367f507ebaa1d1d43ab7d66e6c	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=d3d189e0b0237865d6f71c18f585176a
+_md5_=5af8558f46236bd0973958ce7c9a7cf8
diff --git a/metadata/md5-cache/net-misc/unison-2.48.4-r1 b/metadata/md5-cache/net-misc/unison-2.48.4-r1
index b89d39defd0a..1baabc27c563 100644
--- a/metadata/md5-cache/net-misc/unison-2.48.4-r1
+++ b/metadata/md5-cache/net-misc/unison-2.48.4-r1
@@ -10,4 +10,4 @@ RDEPEND=gtk? ( dev-ml/lablgtk || ( net-misc/x11-ssh-askpass net-misc/ssh-askpass
 RESTRICT=test !ocamlopt? ( strip )
 SLOT=2.48
 SRC_URI=https://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.4/unison-2.48.4.tar.gz doc? ( https://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.4/unison-2.48.4-manual.pdf https://www.seas.upenn.edu/~bcpierce/unison/download/releases/unison-2.48.4/unison-2.48.4-manual.html )
-_md5_=d80c3dbe90af104a5ef7c7138c3b5a7b
+_md5_=e8410c4300383accd0337138d7f16628