2018-03-21 22:22:59 UTC

30 files changed, 97 insertions, 60 deletions

diff --git a/metadata/md5-cache/app-editors/hteditor-2.1.0 b/metadata/md5-cache/app-editors/hteditor-2.1.0
index 6b7f5ebe30b7..eff261164682 100644
--- a/metadata/md5-cache/app-editors/hteditor-2.1.0
+++ b/metadata/md5-cache/app-editors/hteditor-2.1.0
@@ -10,4 +10,4 @@ RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
 SLOT=0
 SRC_URI=mirror://sourceforge/hte/ht-2.1.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=5c784490af88dab7b13d77c9f81c43db
+_md5_=c81ed8fd543d32b251d796c6bf8ca2de
diff --git a/metadata/md5-cache/app-editors/hteditor-2.1.0-r1 b/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
new file mode 100644
index 000000000000..6bceac472973
--- /dev/null
+++ b/metadata/md5-cache/app-editors/hteditor-2.1.0-r1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install prepare
+DEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2 virtual/yacc sys-devel/flex >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=A file viewer, editor and analyzer for text, binary, and executable files
+EAPI=6
+HOMEPAGE=http://hte.sourceforge.net/ https://github.com/sebastianbiallas/ht/
+IUSE=X
+KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris
+LICENSE=GPL-2
+RDEPEND=sys-libs/ncurses:0= X? ( x11-libs/libX11 ) >=dev-libs/lzo-2
+SLOT=0
+SRC_URI=mirror://sourceforge/hte/ht-2.1.0.tar.bz2
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=f58dd3e470236188aaff5c1ee331ef6c
diff --git a/metadata/md5-cache/app-portage/portpeek-2.1.26 b/metadata/md5-cache/app-portage/portpeek-2.1.26
new file mode 100644
index 000000000000..5483c839fb36
--- /dev/null
+++ b/metadata/md5-cache/app-portage/portpeek-2.1.26
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
+DESCRIPTION=A helper program for maintaining the package.keyword and package.unmask files
+EAPI=6
+HOMEPAGE=http://www.mpagano.com/blog/?page_id=3
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6
+KEYWORDS=~amd64 ~arm ~ppc ~sparc ~x86 ~x86-fbsd
+LICENSE=GPL-2
+RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) python_targets_python3_6? ( dev-lang/python:3.6 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=app-portage/gentoolkit-0.4.0 || ( >=sys-apps/portage-2.3.19-r1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] )
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_targets_python3_6 )
+SLOT=0
+SRC_URI=http://www.mpagano.com/downloads/portpeek-2.1.26.tar.gz
+_eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	python-r1	e9350ec46bb5c9f3504b4fbe8b8d8987	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=a77fdf35a9259a4efc088b9c2fd3d014
diff --git a/metadata/md5-cache/app-text/xdvik-22.87.03 b/metadata/md5-cache/app-text/xdvik-22.87.03-r1
index a3d5c4b09272..dd72c8200a5b 100644
--- a/metadata/md5-cache/app-text/xdvik-22.87.03
+++ b/metadata/md5-cache/app-text/xdvik-22.87.03-r1
@@ -1,13 +1,13 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare
-DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig media-libs/freetype:2 x11-libs/libXi x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea
+DEPEND=sys-devel/flex virtual/yacc virtual/pkgconfig media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea
 DESCRIPTION=DVI previewer for X Window System
 EAPI=5
 HOMEPAGE=http://xdvi.sourceforge.net/
 IUSE=motif neXt Xaw3d emacs
 KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=media-libs/freetype:2 x11-libs/libXi x11-libs/libXmu x11-libs/libXp x11-libs/libXpm motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
+RDEPEND=media-libs/freetype:2 x11-libs/libX11 x11-libs/libXi x11-libs/libXmu x11-libs/libXpm x11-libs/libXt motif? ( >=x11-libs/motif-2.3:0 ) !motif? ( neXt? ( x11-libs/neXtaw ) !neXt? ( Xaw3d? ( x11-libs/libXaw3d ) !Xaw3d? ( x11-libs/libXaw ) ) ) dev-libs/kpathsea virtual/latex-base !<app-text/texlive-2007
 SLOT=0
 SRC_URI=mirror://sourceforge/xdvi/xdvik-22.87.03.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	elisp-common	23f47b2e1de7abf387105eddd1318738	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=c9f28337327580aa716323af246056e8
+_md5_=a571386384a537f42b1d2dc85a2b139a
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2 b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2
index 2f4a1cf07f6d..89b034a36d96 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A blazingly fast HTML combinator library for Haskell
 EAPI=5
-HOMEPAGE=http://jaspervdj.be/blaze
+HOMEPAGE=https://jaspervdj.be/blaze/
 IUSE=doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0
 SLOT=0/0.6.1.2
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.6.1.2/blaze-html-0.6.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=32efe0ee3dc099134b4329cd8c6f46cb
+_md5_=01f3000ed1f0847b07d680e69c516886
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.3 b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.3
index a8f6c9f06b94..cd979016625b 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.3
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.6.1.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] <dev-haskell/blaze-markup-0.6:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.2:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.7 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A blazingly fast HTML combinator library for Haskell
 EAPI=5
-HOMEPAGE=http://jaspervdj.be/blaze
+HOMEPAGE=https://jaspervdj.be/blaze/
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0
 SLOT=0/0.6.1.3
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.6.1.3/blaze-html-0.6.1.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f357523e7905a0698bbd6c0366746092
+_md5_=269bd8da51f4e7f063f2134f93de59ec
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.7.1.0 b/metadata/md5-cache/dev-haskell/blaze-html-0.7.1.0
index aecc986cef85..8e9c5bb6e256 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.7.1.0
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.7.1.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-markup-0.6.3:=[profile?] <dev-haskell/blaze-markup-0.7:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.3 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.8 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A blazingly fast HTML combinator library for Haskell
 EAPI=5
-HOMEPAGE=http://jaspervdj.be/blaze
+HOMEPAGE=https://jaspervdj.be/blaze/
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0
 SLOT=0/0.7.1.0
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.7.1.0/blaze-html-0.7.1.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=4d2c15652cfe16629f7a455c9f5ab8a6
+_md5_=bb57658e9b8c503952acf52b0a9987ac
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1 b/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1
index f2a30b2b3dfa..9e699f53d031 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.9 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A blazingly fast HTML combinator library for Haskell
 EAPI=5
-HOMEPAGE=http://jaspervdj.be/blaze
+HOMEPAGE=https://jaspervdj.be/blaze/
 IUSE=doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0
 SLOT=0/0.8.1.1
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.8.1.1/blaze-html-0.8.1.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e7e6119dc060146a436385df15618e52
+_md5_=0ed08bad08020bf093fc0992584613ff
diff --git a/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.2 b/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.2
index b8c2c520128f..c1591ca8452d 100644
--- a/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.2
+++ b/metadata/md5-cache/dev-haskell/blaze-html-0.8.1.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0.5:=[profile?] >=dev-haskell/blaze-markup-0.7:=[profile?] <dev-haskell/blaze-markup-0.8:=[profile?] >=dev-haskell/text-0.10:=[profile?] <dev-haskell/text-1.3:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.4 <dev-haskell/quickcheck-2.10 >=dev-haskell/test-framework-0.4 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.3 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.3 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=A blazingly fast HTML combinator library for Haskell
 EAPI=6
-HOMEPAGE=http://jaspervdj.be/blaze
+HOMEPAGE=https://jaspervdj.be/blaze/
 IUSE=doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/blaze-builder-0.3:=[profile?] <dev-haskell/blaze-builder-0
 SLOT=0/0.8.1.2
 SRC_URI=mirror://hackage/packages/archive/blaze-html/0.8.1.2/blaze-html-0.8.1.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=bdb609e5e16a3f5ac1fc8c6adb0506ea
+_md5_=2a3dc62218505af807e199f27ddd6f67
diff --git a/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.4 b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.4
index f3ad0853cd49..009f1900f47f 100644
--- a/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.4
+++ b/metadata/md5-cache/dev-haskell/bytestring-handle-0.1.0.4
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=>=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hunit-1.2 <dev-haskell/hunit-1.4 >=dev-haskell/quickcheck-2.1.2 >=dev-haskell/test-framework-0.2.0 <dev-haskell/test-framework-0.9 >=dev-haskell/test-framework-hunit-0.2.0 <dev-haskell/test-framework-hunit-0.4 >=dev-haskell/test-framework-quickcheck2-0.2.5 <dev-haskell/test-framework-quickcheck2-0.4 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=ByteString-backed Handles
 EAPI=6
-HOMEPAGE=http://hub.darcs.net/ganesh/bytestring-handle
+HOMEPAGE=https://hub.darcs.net/ganesh/bytestring-handle
 IUSE=doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-lang/ghc-7.4.1:=
 SLOT=0/0.1.0.4
 SRC_URI=mirror://hackage/packages/archive/bytestring-handle/0.1.0.4/bytestring-handle-0.1.0.4.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=241f10356b4920cdc7f635bfbc43dd82
+_md5_=03c445f554b96bb0cb4c832e6c935ab6
diff --git a/metadata/md5-cache/dev-haskell/css-text-0.1.2.1 b/metadata/md5-cache/dev-haskell/css-text-0.1.2.1
index 9bc6934c6e7a..d6d351470500 100644
--- a/metadata/md5-cache/dev-haskell/css-text-0.1.2.1
+++ b/metadata/md5-cache/dev-haskell/css-text-0.1.2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/text-0.11:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8 test? ( >=dev-haskell/hspec-1.3 dev-haskell/quickcheck ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=CSS parser and renderer
 EAPI=5
-HOMEPAGE=http://www.yesodweb.com/
+HOMEPAGE=https://www.yesodweb.com/
 IUSE=doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/attoparsec-0.10.2.0:=[profile?] >=dev-haskell/text-0.11:=[
 SLOT=0/0.1.2.1
 SRC_URI=mirror://hackage/packages/archive/css-text/0.1.2.1/css-text-0.1.2.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=7d0d81c1800e25bd22eed61971c22f62
+_md5_=e89c43ab5fb523c9971bd0c034619b82
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.5.2.3 b/metadata/md5-cache/dev-haskell/fgl-5.5.2.3
index 0bc1605ed0c2..bd28f44d69c9 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.5.2.3
+++ b/metadata/md5-cache/dev-haskell/fgl-5.5.2.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.9 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=5
-HOMEPAGE=http://hackage.haskell.org/package/fgl
+HOMEPAGE=https://hackage.haskell.org/package/fgl
 IUSE=doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/5.5.2.3
 SRC_URI=mirror://hackage/packages/archive/fgl/5.5.2.3/fgl-5.5.2.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3e97cc7f2276d15ecf704f1ed1f3d24b
+_md5_=f7b57d3f8069f6a084808d40f20f8106
diff --git a/metadata/md5-cache/dev-haskell/fgl-5.5.3.0 b/metadata/md5-cache/dev-haskell/fgl-5.5.3.0
index 15a7cefcbc32..65f77ac75e70 100644
--- a/metadata/md5-cache/dev-haskell/fgl-5.5.3.0
+++ b/metadata/md5-cache/dev-haskell/fgl-5.5.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.10 test? ( >=dev-haskell/hspec-2.1 <dev-haskell/hspec-2.3 >=dev-haskell/quickcheck-2.8 <dev-haskell/quickcheck-2.10 ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Martin Erwig's Functional Graph Library
 EAPI=6
-HOMEPAGE=http://hackage.haskell.org/package/fgl
+HOMEPAGE=https://hackage.haskell.org/package/fgl
 IUSE=doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=dev-haskell/transformers:=[profile?] >=dev-lang/ghc-7.4.1:=
 SLOT=0/5.5.3.0
 SRC_URI=mirror://hackage/packages/archive/fgl/5.5.3.0/fgl-5.5.3.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e7c2b09b9368ed1db9dce4cff5f3b6a7
+_md5_=405acc480d4ba051557ba5fbc74f833b
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.1.9.2 b/metadata/md5-cache/dev-haskell/hamlet-1.1.9.2
index 339dd7da635d..d0cd2b359228 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.1.9.2
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.1.9.2
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0.4:=[profile?] >=dev-haskell/blaze-html-0.5:=[profile?] >=dev-haskell/blaze-markup-0.5.1:=[profile?] >=dev-haskell/failure-0.1:=[profile?] <dev-haskell/failure-0.3:=[profile?] >=dev-haskell/parsec-2:=[profile?] <dev-haskell/parsec-4:=[profile?] >=dev-haskell/shakespeare-1.2.0.4:=[profile?] <dev-haskell/shakespeare-1.3:=[profile?] >=dev-haskell/system-fileio-0.3:=[profile?] >=dev-haskell/system-filepath-0.4:=[profile?] >=dev-haskell/text-0.7:=[profile?] >=dev-lang/ghc-6.12.1:= >=dev-haskell/cabal-1.8.0.2 test? ( >=dev-haskell/hspec-1.3 dev-haskell/hunit ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Haml-like template files that are compile-time checked
 EAPI=5
-HOMEPAGE=http://www.yesodweb.com/book/shakespearean-templates
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
 IUSE=doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/blaze-builder-0.2:=[profile?] <dev-haskell/blaze-builder-0
 SLOT=0/1.1.9.2
 SRC_URI=mirror://hackage/packages/archive/hamlet/1.1.9.2/hamlet-1.1.9.2.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=3b0ff772e9428cf22ab5daf99da01d4f
+_md5_=58aed623929ee362857dfcdb46ed31b9
diff --git a/metadata/md5-cache/dev-haskell/hamlet-1.2.0 b/metadata/md5-cache/dev-haskell/hamlet-1.2.0
index 43628f9bd722..6dea170f1650 100644
--- a/metadata/md5-cache/dev-haskell/hamlet-1.2.0
+++ b/metadata/md5-cache/dev-haskell/hamlet-1.2.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.8
 DESCRIPTION=Haml-like template files that are compile-time checked (deprecated)
 EAPI=5
-HOMEPAGE=http://www.yesodweb.com/book/shakespearean-templates
+HOMEPAGE=https://www.yesodweb.com/book/shakespearean-templates
 IUSE=profile
 KEYWORDS=~amd64 ~x86
 LICENSE=MIT
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/shakespeare-2.0:=[profile?] >=dev-lang/ghc-6.10.4:=
 SLOT=0/1.2.0
 SRC_URI=mirror://hackage/packages/archive/hamlet/1.2.0/hamlet-1.2.0.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=526ba49269995e725aa67c91eb04b7d9
+_md5_=da6e3bbab8120f89f6e5cdefaff8e4a2
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.24 b/metadata/md5-cache/dev-haskell/haxml-1.24
index 1c2cc94bf752..d36625b2a39e 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.24
+++ b/metadata/md5-cache/dev-haskell/haxml-1.24
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpa
 DEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.2 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities for manipulating XML documents
 EAPI=5
-HOMEPAGE=http://www.cs.york.ac.uk/fp/HaXml/
+HOMEPAGE=https://archives.haskell.org/projects.haskell.org/HaXml/
 IUSE=doc hscolour profile
 KEYWORDS=amd64 ~ia64 ~ppc ~ppc64 ~sparc x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >
 SLOT=0/1.24
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.24/HaXml-1.24.tar.gz
 _eclasses_=base	983774947da124fb7d542ce25a218bb1	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=27a980a0ad08eb129ee9696d2f5c938a
+_md5_=d50f88e1b5d9d349ed52ca362cb15b9c
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.24.1 b/metadata/md5-cache/dev-haskell/haxml-1.24.1
index 216d0ff436fe..062471e76c40 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.24.1
+++ b/metadata/md5-cache/dev-haskell/haxml-1.24.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-6.10.4:= >=dev-haskell/cabal-1.6.0.3 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities for manipulating XML documents
 EAPI=5
-HOMEPAGE=http://www.cs.york.ac.uk/fp/HaXml/
+HOMEPAGE=https://archives.haskell.org/projects.haskell.org/HaXml/
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/polyparse-1.9:=[profile?] dev-haskell/random:=[profile?] >
 SLOT=0/1.24.1
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.24.1/HaXml-1.24.1.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=e222067c04daed50e8f17c1a17622315
+_md5_=cce5ab4a2883b714b7d57f704f32df7d
diff --git a/metadata/md5-cache/dev-haskell/haxml-1.25.3 b/metadata/md5-cache/dev-haskell/haxml-1.25.3
index 927b9f0113f9..68a99fe6def4 100644
--- a/metadata/md5-cache/dev-haskell/haxml-1.25.3
+++ b/metadata/md5-cache/dev-haskell/haxml-1.25.3
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/polyparse-1.10:=[profile?] dev-haskell/random:=[profile?] >=dev-lang/ghc-7.4.1:= >=dev-haskell/cabal-1.8 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Utilities for manipulating XML documents
 EAPI=5
-HOMEPAGE=http://projects.haskell.org/HaXml/
+HOMEPAGE=https://archives.haskell.org/projects.haskell.org/HaXml/
 IUSE=doc hscolour profile
 KEYWORDS=~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=LGPL-2.1
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/polyparse-1.10:=[profile?] dev-haskell/random:=[profile?]
 SLOT=0/1.25.3
 SRC_URI=mirror://hackage/packages/archive/HaXml/1.25.3/HaXml-1.25.3.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=29ad1e1dde88fbd82613926358a45bd4
+_md5_=13ce641cc58dfb70ea498a2c5930af45
diff --git a/metadata/md5-cache/dev-haskell/hs3-0.5.9 b/metadata/md5-cache/dev-haskell/hs3-0.5.9
index 2095c656420a..34c50aa2c76b 100644
--- a/metadata/md5-cache/dev-haskell/hs3-0.5.9
+++ b/metadata/md5-cache/dev-haskell/hs3-0.5.9
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install postinst postrm setup test
 DEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >=dev-haskell/http-4000.0.0:=[profile?] >=dev-haskell/hxt-9.0.0:=[profile?] <dev-haskell/hxt-10:=[profile?] >=dev-haskell/missingh-0.18.6:=[profile?] dev-haskell/random:=[profile?] dev-haskell/regex-compat:=[profile?] dev-haskell/utf8-string:=[profile?] >=dev-lang/ghc-7.4.1:= network-uri? ( >=dev-haskell/network-2.6:=[profile?] >=dev-haskell/network-uri-2.6:=[profile?] ) !network-uri? ( <dev-haskell/network-2.6:=[profile?] <dev-haskell/network-uri-2.6:=[profile?] ) >=dev-haskell/cabal-1.6 doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Interface to Amazon's Simple Storage Service (S3)
 EAPI=5
-HOMEPAGE=http://gregheartsfield.com/hS3/
+HOMEPAGE=https://gregheartsfield.com/hS3/
 IUSE=+network-uri doc hscolour profile
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
@@ -10,4 +10,4 @@ RDEPEND=>=dev-haskell/crypto-4.1.0:=[profile?] dev-haskell/dataenc:=[profile?] >
 SLOT=0/0.5.9
 SRC_URI=mirror://hackage/packages/archive/hS3/0.5.9/hS3-0.5.9.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	ghc-package	f9cf05643e20f03876bb4807f008c80f	haskell-cabal	45605f3898bdc59eb016fb50ca27bf18	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6bd024bf4b218d1f56ba6817648597e7
+_md5_=ab846aee4f22a46805f8ff41e0a19039
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.8.6 b/metadata/md5-cache/dev-libs/libbsd-0.8.6
index af82f0d0f538..4de36947c8ac 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.8.6
+++ b/metadata/md5-cache/dev-libs/libbsd-0.8.6
@@ -9,4 +9,4 @@ LICENSE=BSD BSD-2 BSD-4 ISC
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.8.6.tar.xz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=a95b26e9fce0bd119ff3ae414e83eeb9
+_md5_=a316e3bfd03b888af6cd2611f49037d1
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.8.7 b/metadata/md5-cache/dev-libs/libbsd-0.8.7
index 280c40562e1e..e521598815b3 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.8.7
+++ b/metadata/md5-cache/dev-libs/libbsd-0.8.7
@@ -9,4 +9,4 @@ LICENSE=BSD BSD-2 BSD-4 ISC
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.8.7.tar.xz
 _eclasses_=multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=59ad8988ef2f586d89e38848b1a6feee
+_md5_=f96484464eeadc62c839deaca494b516
diff --git a/metadata/md5-cache/dev-util/kdevelop-5.2.1 b/metadata/md5-cache/dev-util/kdevelop-5.2.1
index f4cdf7483171..3c83d68f6a72 100644
--- a/metadata/md5-cache/dev-util/kdevelop-5.2.1
+++ b/metadata/md5-cache/dev-util/kdevelop-5.2.1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=5
 SRC_URI=mirror://kde/stable/kdevelop/5.2.1/src/kdevelop-5.2.1.tar.xz
 _eclasses_=cmake-utils	3e3d64589bcd55d8234821f311e58d28	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	gnome2-utils	4d211d7614f303710fca59db6ec12c88	kde5	4ad48fa1569968bb36efce3e4a163346	kde5-functions	f969e0903765bc89fad95c1552831e5e	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	ninja-utils	ebb2eaddc6331c4fa000b8eb8f6fe074	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	virtualx	3a3c4637ea6d5a2113707a644766337c	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=f75d98a0f4ed20f45726b901abd92948
+_md5_=18a6b199f226b5e1769dada9b723dedc
diff --git a/metadata/md5-cache/net-irc/emech-3.0.99_p3 b/metadata/md5-cache/net-irc/emech-3.0.99_p3
new file mode 100644
index 000000000000..b381d29f0832
--- /dev/null
+++ b/metadata/md5-cache/net-irc/emech-3.0.99_p3
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare
+DESCRIPTION=UNIX compatible IRC bot programmed in the C language
+EAPI=6
+HOMEPAGE=http://www.energymech.net/
+IUSE=debug session tcl
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=http://www.energymech.net/files/emech-3.0.99p3.tar.gz
+_eclasses_=multilib	97f470f374f2e94ccab04a2fb21d811e	readme.gentoo-r1	6f03e110529650f57fc7d1fb908b8986	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=4fe629a06694f423a134068560621ebc
diff --git a/metadata/md5-cache/net-libs/libsoup-2.58.2 b/metadata/md5-cache/net-libs/libsoup-2.58.2
index 2979f9062841..0dc158528e3f 100644
--- a/metadata/md5-cache/net-libs/libsoup-2.58.2
+++ b/metadata/md5-cache/net-libs/libsoup-2.58.2
@@ -11,4 +11,4 @@ REQUIRED_USE=vala? ( introspection )
 SLOT=2.4
 SRC_URI=mirror://gnome/sources/libsoup/2.58/libsoup-2.58.2.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	gnome.org	5e4cc5af3f1b17bdee155bf02e8c2df4	gnome2	6e4acb9c9da2cfa25f2dfedb93bb4a43	gnome2-utils	4d211d7614f303710fca59db6ec12c88	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	preserve-libs	ef207dc62baddfddfd39a164d9797648	python-any-r1	27d7f9da7187d283b7f3eae8390b7b09	python-utils-r1	c9de01becf9df3f8c10aeec3dc693f5d	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vala	103e6885c83965507391cdc5b6fa0e67	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg	6cd76cc914c1a759dee032778487b57f	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
-_md5_=80e20201d98c772b6e82e3a456fb401f
+_md5_=659719ed43f7c6183d584b696012c91e
diff --git a/metadata/md5-cache/net-misc/curl-7.59.0 b/metadata/md5-cache/net-misc/curl-7.59.0
index 203cdfea8cb3..e83158e0650a 100644
--- a/metadata/md5-cache/net-misc/curl-7.59.0
+++ b/metadata/md5-cache/net-misc/curl-7.59.0
@@ -4,7 +4,7 @@ DESCRIPTION=A Client that groks URLs
 EAPI=6
 HOMEPAGE=https://curl.haxx.se/
 IUSE=adns brotli http2 idn ipv6 kerberos ldap metalink rtmp samba ssh ssl static-libs test threads curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss +curl_ssl_openssl curl_ssl_winssl elibc_Winnt 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=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=ldap? ( net-nds/openldap[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(-)?] ) brotli? ( app-arch/brotli:= ) ssl? ( curl_ssl_axtls? ( net-libs/axtls: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(-)?] app-misc/ca-certificates ) curl_ssl_gnutls? ( net-libs/gnutls: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(-)?] dev-libs/nettle: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(-)?] app-misc/ca-certificates ) curl_ssl_libressl? ( dev-libs/libressl: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(-)?] ) curl_ssl_mbedtls? ( net-libs/mbedtls: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(-)?] app-misc/ca-certificates ) curl_ssl_openssl? ( dev-libs/openssl: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(-)?] ) curl_ssl_nss? ( dev-libs/nss: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(-)?] app-misc/ca-certificates ) ) http2? ( net-libs/nghttp2[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(-)?] ) idn? ( net-dns/libidn2: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(-)?] ) adns? ( net-dns/c-ares: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(-)?] ) kerberos? ( >=virtual/krb5-0-r1[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(-)?] ) metalink? ( >=media-libs/libmetalink-0.1.1[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(-)?] ) rtmp? ( media-video/rtmpdump[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(-)?] ) ssh? ( net-libs/libssh2[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(-)?] ) sys-libs/zlib[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(-)?] abi_x86_32? ( !<=app-emulation/emul-linux-x86-baselibs-20140508-r13 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] )
 REQUIRED_USE=curl_ssl_winssl? ( elibc_Winnt ) threads? ( !adns ) ssl? ( ^^ ( curl_ssl_axtls curl_ssl_gnutls curl_ssl_libressl curl_ssl_mbedtls curl_ssl_nss curl_ssl_openssl curl_ssl_winssl ) )
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://curl.haxx.se/download/curl-7.59.0.tar.bz2
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multibuild	72647e255187a1fadc81097b3657e5c3	multilib	97f470f374f2e94ccab04a2fb21d811e	multilib-build	8ffb5e2112a70fef5f37fcacad308726	multilib-minimal	9139c3a57e077cb8e0d0f73ceb080b89	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cda61ea9e0d29cccc9a8a8ac907a8b9d
+_md5_=bcc257c221ff3071792c055abe5bfb96
diff --git a/metadata/md5-cache/net-misc/ntp-4.2.8_p11 b/metadata/md5-cache/net-misc/ntp-4.2.8_p11
index ebc92a76ba76..74f58399ffda 100644
--- a/metadata/md5-cache/net-misc/ntp-4.2.8_p11
+++ b/metadata/md5-cache/net-misc/ntp-4.2.8_p11
@@ -4,11 +4,11 @@ DESCRIPTION=Network Time Protocol suite/programs
 EAPI=6
 HOMEPAGE=http://www.ntp.org/
 IUSE=caps debug ipv6 libressl openntpd parse-clocks readline samba selinux snmp ssl +threads vim-syntax zeroconf
-KEYWORDS=alpha amd64 ~arm arm64 ~hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
+KEYWORDS=alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~m68k-mint
 LICENSE=HPND BSD ISC
 PDEPEND=openntpd? ( net-misc/openntpd )
 RDEPEND=readline? ( >=sys-libs/readline-4.1:0= ) >=dev-libs/libevent-2.0.9:=[threads?] kernel_linux? ( caps? ( sys-libs/libcap ) ) zeroconf? ( net-dns/avahi[mdnsresponder-compat] ) snmp? ( net-analyzer/net-snmp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl ) ) parse-clocks? ( net-misc/pps-tools ) selinux? ( sec-policy/selinux-ntp ) vim-syntax? ( app-vim/ntp-syntax ) !net-misc/ntpsec !openntpd? ( !net-misc/openntpd )
 SLOT=0
 SRC_URI=http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/ntp-4.2.8p11.tar.gz https://dev.gentoo.org/~polynomial-c/ntp-4.2.8p11-manpages.tar.xz
 _eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	a31844b675f1a1fea87fbe1144aee5f5	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=144ecea905d0dcc6be6620019555ee06
+_md5_=282fafa8c8808ed64f21b141f4a50e88
diff --git a/metadata/md5-cache/sci-mathematics/octave-4.2.2 b/metadata/md5-cache/sci-mathematics/octave-4.2.2
new file mode 100644
index 000000000000..9654ea6bd3df
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/octave-4.2.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup
+DEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) openssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) gui? ( dev-qt/linguist-tools:5 ) qrupdate? ( app-misc/pax-utils ) sparse? ( app-misc/pax-utils ) java? ( >=virtual/jdk-1.6.0 ) doc? ( virtual/latex-base dev-texlive/texlive-fontsrecommended || ( dev-texlive/texlive-plaingeneric dev-texlive/texlive-genericrecommended ) dev-texlive/texlive-metapost ) sys-apps/texinfo dev-util/gperf virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=High-level interactive language for numerical computations
+EAPI=6
+HOMEPAGE=http://www.octave.org/
+IUSE=curl doc fftw +glpk gnuplot graphicsmagick gui hdf5 +imagemagick java opengl openssl portaudio postscript +qhull +qrupdate readline sndfile +sparse static-libs X zlib elibc_FreeBSD java
+KEYWORDS=amd64 ~arm hppa ppc ppc64 x86 ~x86-fbsd ~amd64-linux ~x86-linux
+LICENSE=GPL-3
+RDEPEND=app-arch/bzip2 app-text/ghostscript-gpl dev-libs/libpcre:3= sys-libs/ncurses:0= sys-libs/zlib virtual/blas virtual/lapack curl? ( net-misc/curl:0= ) fftw? ( sci-libs/fftw:3.0= ) glpk? ( sci-mathematics/glpk:0= ) gnuplot? ( sci-visualization/gnuplot ) hdf5? ( sci-libs/hdf5:0= ) imagemagick? ( !graphicsmagick? ( media-gfx/imagemagick:=[cxx] ) graphicsmagick? ( media-gfx/graphicsmagick:=[cxx] ) ) java? ( >=virtual/jre-1.6.0:* ) opengl? ( media-libs/freetype:2= media-libs/fontconfig:1.0= >=x11-libs/fltk-1.3:1=[opengl,xft] x11-libs/gl2ps:0= virtual/glu ) openssl? ( dev-libs/openssl:0= ) portaudio? ( media-libs/portaudio ) postscript? ( app-text/epstool media-gfx/pstoedit media-gfx/transfig ) qhull? ( media-libs/qhull:0= ) qrupdate? ( sci-libs/qrupdate:0= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtopengl:5 >=x11-libs/qscintilla-2.9.3-r2:=[qt5(+)] ) readline? ( sys-libs/readline:0= ) sndfile? ( media-libs/libsndfile ) sparse? ( sci-libs/arpack:0= sci-libs/camd:0= sci-libs/ccolamd:0= sci-libs/cholmod:0= sci-libs/colamd:0= sci-libs/cxsparse:0= sci-libs/umfpack:0= ) X? ( x11-libs/libX11:0= ) virtual/fortran java? ( >=dev-java/java-config-2.2.0-r3 )
+SLOT=0/4.2.2
+SRC_URI=mirror://gnu/octave/octave-4.2.2.tar.gz
+_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	fortran-2	9e7f20c99213f0627ff7f873d4aaa25d	java-pkg-opt-2	77d2e22d0de7640f817d20e861c0ff3f	java-utils-2	0ee72667014428e01a01df2345244cf3	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	pax-utils	b963274a93e76570a88168c1f1db4cd7	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37	xdg-utils	f2c8335407f0b935b0a96d4adf23ef25
+_md5_=c16010c51931676af380a1fd17387e65
diff --git a/metadata/md5-cache/sys-block/parted-3.2 b/metadata/md5-cache/sys-block/parted-3.2
deleted file mode 100644
index e9f46529de38..000000000000
--- a/metadata/md5-cache/sys-block/parted-3.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.7-r7:0= device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= ) selinux? ( sys-libs/libselinux ) nls? ( >=sys-devel/gettext-0.12.1-r2 ) virtual/pkgconfig >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.16:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=Create, destroy, resize, check, copy partitions and file systems
-EAPI=5
-HOMEPAGE=https://www.gnu.org/software/parted
-IUSE=+debug device-mapper nls readline selinux static-libs
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86
-LICENSE=GPL-3
-RDEPEND=>=sys-fs/e2fsprogs-1.27 >=sys-libs/ncurses-5.7-r7:0= device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/readline-5.2:0= ) selinux? ( sys-libs/libselinux )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://gnu/parted/parted-3.2.tar.xz
-_eclasses_=autotools	4842e626555a9a4344f34cef2e190b67	desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	libtool	0081a71a261724730ec4c248494f044d	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=147113a9d9995e89000a4e702526007b
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 488c31196141..e38c32b6f1c5 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -1473,7 +1473,7 @@ app-text/wv 1.2.9-r2: Tool for conversion of MSWord doc and rtf files to somethi
 app-text/wv2 0.4.2-r2: Excellent MS Word filter lib, used in most Office suites
 app-text/xapian-omega 1.2.24 1.4.4: An application built on Xapian, consisting of indexers and a CGI search frontend
 app-text/xchm 1.23-r1: Utility for viewing Compiled HTML Help (CHM) files
-app-text/xdvik 22.87.03: DVI previewer for X Window System
+app-text/xdvik 22.87.03-r1: DVI previewer for X Window System
 app-text/xfbib 0.0.2-r1 0.0.2-r2: a lightweight BibTeX editor
 app-text/xhtml1 20020801-r5: DTDs for the eXtensible HyperText Markup Language 1.0
 app-text/xindy 2.4-r1: A Flexible Indexing System
@@ -9324,7 +9324,7 @@ sci-mathematics/mathomatic 15.8.5: Automatic algebraic manipulator
 sci-mathematics/maxima 5.38.1: Free computer algebra environment based on Macsyma
 sci-mathematics/nauty 2.5.9: Computing automorphism groups of graphs and digraphs
 sci-mathematics/normaliz 2.12.2 3.1.1 3.1.3: Tool for computations in affine monoids and more
-sci-mathematics/octave 4.2.1: High-level interactive language for numerical computations
+sci-mathematics/octave 4.2.1 4.2.2: High-level interactive language for numerical computations
 sci-mathematics/otter 3.3-r3: An Automated Deduction System
 sci-mathematics/pari 2.3.5: A software package for computer-aided number theory
 sci-mathematics/prng 3.0.2-r2: Pseudo-Random Number Generator library
@@ -9856,7 +9856,7 @@ sys-block/mtx 1.3.12: Utilities for controlling SCSI media changers and tape dri
 sys-block/nbd 3.11 3.15.3: Userland client/server for kernel network block device
 sys-block/noflushd 2.7.3: A daemon to spin down your disks and force accesses to be cached
 sys-block/open-iscsi 2.0.872-r2 2.0.873 2.0.873-r1: A performant, transport independent, multi-platform implementation of RFC3720
-sys-block/parted 3.2 3.2-r1: Create, destroy, resize, check, copy partitions and file systems
+sys-block/parted 3.2-r1: Create, destroy, resize, check, copy partitions and file systems
 sys-block/partimage 0.6.9: Console-based application to efficiently save raw partition data to image file
 sys-block/partitionmanager 3.3.1: KDE utility for management of partitions and file systems
 sys-block/qla-fc-firmware 20101015: QLogic Linux Fibre Channel HBA Firmware for ql2xxx cards
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 909f51a0ae06..614c3b5d13ae 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Mar 2018 21:48:02 +0000
+Wed, 21 Mar 2018 22:22:59 +0000