2019-09-30 07:46:12 UTC

14 files changed, 37 insertions, 54 deletions

diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
index b0be78a9e9d6..02f0fc29dd71 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.1.2.1
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.12.0.2:=[profile?] dev-haskell/aeson:=[profile?] dev-
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files +hexpat +network +small_base unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files +hexpat +network +small-base unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.0.2:=[profile?] dev-haskell/aeson:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/json:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] dev-haskell/text:=[profile?] dev-haskell/utf8-string:=[profile?] dev-haskell/vector:=[profile?] >=dev-haskell/yaml-0.8:=[profile?] >=dev-lang/ghc-6.12.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.1.2.1
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.1.2.1/pandoc-citeproc-0.1.2.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=816a3fe5f18e19d5867d76838e6843b3
+_md5_=c7e2d6cb28bfa414613ab88c635438d8
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4
index 8462ece9cc75..b580e25a9bbc 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed-data-files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=6
 HOMEPAGE=https://github.com/jgm/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
-RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
+RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.5:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
 RESTRICT=test
 SLOT=0/0.10.4
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.10.4/pandoc-citeproc-0.10.4.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=060d795e271b4d97d388e19c315ce8da
+_md5_=f83ea0d14cd73b7853a772cb68a176b7
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1
index be057690aadd..66e1028eb743 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.10.4.1
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test_citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 test? ( !test-citeproc? ( >=dev-haskell/temporary-1.1 ) ) embed-data-files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=6
 HOMEPAGE=https://github.com/jgm/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
-RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test_citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test_citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
+RDEPEND=>=app-text/pandoc-1.16:=[profile?] <app-text/pandoc-2.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-1.2:=[profile?] >=dev-haskell/aeson-pretty-0.8:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.16:=[profile?] <dev-haskell/pandoc-types-1.18:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.6:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) test-citeproc? ( >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/vector-0.10:=[profile?] ) !test-citeproc? ( dev-haskell/vector:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
 RESTRICT=test
 SLOT=0/0.10.4.1
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.10.4.1/pandoc-citeproc-0.10.4.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=cbbb0c229f8b1f74e2de5b087c555326
+_md5_=1d0ba79d7bd6df50d9776190967cbc64
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
index 28eed9925ae3..dd9f95ff8318 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.2
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-ha
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files +hexpat +network +small_base unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files +hexpat +network +small-base unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/yaml-0.8:=[profile?] >=dev-lang/ghc-7.0.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.2
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.2/pandoc-citeproc-0.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f9a1d3cd269cd3db2e72765023a19ce8
+_md5_=8f67a706abf69aa5b62ad0d05abc62f1
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
index 403dd0c010ca..bf8b05446155 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.3.1
@@ -3,11 +3,11 @@ DEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-ha
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files +hexpat +network test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files +hexpat +network test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] dev-haskell/aeson:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] >=dev-haskell/texmath-0.6.4:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) hexpat? ( >=dev-haskell/hexpat-0.20.2:=[profile?] ) !hexpat? ( dev-haskell/xml:=[profile?] ) network? ( >=dev-haskell/http-4000.0.9:=[profile?] >=dev-haskell/network-2:=[profile?] dev-haskell/network-uri:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
 SLOT=0/0.3.1
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.3.1/pandoc-citeproc-0.3.1.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=9454bea0e41c6edd751e1a4031638c31
+_md5_=6674ccb65b2772e60add4c1b6c75f339
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6
index 076c18dfa77d..954354475406 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.6
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.12.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?]
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.12.1:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.9:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.3:=[profile?] >=dev-haskell/yaml-0.8.8.2:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.6
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.6/pandoc-citeproc-0.6.tar.gz
 _eclasses_=base	2ec5c64f5de125f0c65a927c4c128fef	desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5afe86981240fe810fa9f61ecad2e200
+_md5_=eab938974cd0f8ef8cc3325daaccb0a0
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2
index 1c10f614aeb3..67640a47cc03 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.7.2
@@ -3,7 +3,7 @@ DEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <d
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=amd64 x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.10:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/vector-0.10:=[profile?] <dev-haskell/vector-0.11:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.7.2
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.7.2/pandoc-citeproc-0.7.2.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=1591554beceee3ba9980a56d8fa905ca
+_md5_=abcd9fcae3b378fc597aac7858895408
diff --git a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3 b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3
index 8d902b54a5ef..454cadaf4602 100644
--- a/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3
+++ b/metadata/md5-cache/dev-haskell/pandoc-citeproc-0.8.1.3
@@ -1,9 +1,9 @@
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.11:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 embed_data_files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
+DEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.11:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] ) >=dev-haskell/cabal-1.12 embed-data-files? ( dev-haskell/hsb2hs ) doc? ( || ( dev-haskell/haddock >=dev-lang/ghc-7.10.2 ) ) hscolour? ( dev-haskell/hscolour )
 DESCRIPTION=Supports using pandoc with citeproc
 EAPI=5
 HOMEPAGE=http://hackage.haskell.org/package/pandoc-citeproc
-IUSE=+bibutils debug embed_data_files test_citeproc unicode_collation doc hscolour profile test
+IUSE=+bibutils debug embed-data-files test-citeproc unicode_collation doc hscolour profile test
 KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=app-text/pandoc-1.13:=[profile?] >=dev-haskell/aeson-0.7:=[profile?] <dev-haskell/aeson-0.11:=[profile?] dev-haskell/aeson-pretty:=[profile?] dev-haskell/attoparsec:=[profile?] dev-haskell/data-default:=[profile?] dev-haskell/mtl:=[profile?] dev-haskell/old-locale:=[profile?] >=dev-haskell/pandoc-types-1.12.3:=[profile?] dev-haskell/parsec:=[profile?] >=dev-haskell/setenv-0.1:=[profile?] <dev-haskell/setenv-0.2:=[profile?] dev-haskell/split:=[profile?] dev-haskell/syb:=[profile?] dev-haskell/tagsoup:=[profile?] >=dev-haskell/temporary-1.1:=[profile?] dev-haskell/text:=[profile?] >=dev-haskell/unordered-containers-0.2:=[profile?] <dev-haskell/unordered-containers-0.3:=[profile?] >=dev-haskell/vector-0.10:=[profile?] >=dev-haskell/xml-conduit-1.2:=[profile?] <dev-haskell/xml-conduit-1.4:=[profile?] >=dev-haskell/yaml-0.8.8.7:=[profile?] >=dev-lang/ghc-7.4.1:= bibutils? ( >=dev-haskell/hs-bibutils-0.3:=[profile?] ) debug? ( dev-haskell/pretty-show:=[profile?] ) unicode_collation? ( dev-haskell/text-icu:=[profile?] ) !unicode_collation? ( dev-haskell/rfc5051:=[profile?] )
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0/0.8.1.3
 SRC_URI=mirror://hackage/packages/archive/pandoc-citeproc/0.8.1.3/pandoc-citeproc-0.8.1.3.tar.gz
 _eclasses_=desktop	b1d22ac8bdd4679ab79c71aca235009d	eapi7-ver	756b3f27d8e46131d5cf3c51bd876446	epatch	a1bf4756dba418a7238f3be0cb010c54	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	ghc-package	fac7ea2deca456f8e70b85a6ebef9e8a	haskell-cabal	b5e68c01ecdfbaa48ee638388bdc1c7c	ltprune	2729691420b6deeda2a90b1f1183fb55	multilib	1d91b03d42ab6308b5f4f6b598ed110e	multiprocessing	cac3169468f893670dac3e7cb940e045	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=dd2bc27f520d5dbcc64a1d502754d280
+_md5_=b34ec21a0b6e5d34f56a5b49a5d51342
diff --git a/metadata/md5-cache/net-libs/libnet-1.2.9999 b/metadata/md5-cache/net-libs/libnet-1.2.9999
new file mode 100644
index 000000000000..981915d80f8e
--- /dev/null
+++ b/metadata/md5-cache/net-libs/libnet-1.2.9999
@@ -0,0 +1,11 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !<sys-devel/gettext-0.18.1.1-r3 || ( >=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 >=dev-vcs/git-1.8.2.1[curl]
+DEFINED_PHASES=configure install prepare unpack
+DESCRIPTION=library providing an API for commonly used low-level network functions
+EAPI=7
+HOMEPAGE=http://libnet-dev.sourceforge.net/ https://github.com/sam-github/libnet
+IUSE=doc static-libs
+LICENSE=BSD BSD-2 HPND
+PROPERTIES=live
+SLOT=1.1
+_eclasses_=autotools	1bf086cdd7356f5c9a4acd9727bd2065	git-r3	562b380fc59ae6a8622171d0acb777d1	libtool	f143db5a74ccd9ca28c1234deffede96	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a
+_md5_=594d5578cff434c4f54217e22cf666d1
diff --git a/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1 b/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1
deleted file mode 100644
index b7858d76c2a0..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.7.1628.33_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* amd64 ~arm x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_amd64.deb -> vivaldi-2.7.1628.33_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_armhf.deb -> vivaldi-2.7.1628.33_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.7.1628.33-1_i386.deb -> vivaldi-2.7.1628.33_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/md5-cache/www-client/vivaldi-2.8.1664.36_p1 b/metadata/md5-cache/www-client/vivaldi-2.8.1664.36_p1
deleted file mode 100644
index 6d6f9ada9656..000000000000
--- a/metadata/md5-cache/www-client/vivaldi-2.8.1664.36_p1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm prepare setup unpack
-DEPEND=virtual/libiconv
-DESCRIPTION=A browser for our friends
-EAPI=7
-HOMEPAGE=https://vivaldi.com/
-IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~x86
-LICENSE=Vivaldi
-RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.36-1_amd64.deb -> vivaldi-2.8.1664.36_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.36-1_armhf.deb -> vivaldi-2.8.1664.36_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.36-1_i386.deb -> vivaldi-2.8.1664.36_p1-i386.deb )
-_eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ad3d712e255fffc3879cdf00b491412
diff --git a/metadata/md5-cache/www-client/vivaldi-2.8.1664.40_p1 b/metadata/md5-cache/www-client/vivaldi-2.8.1664.40_p1
index 141cd361c309..ee7857545b04 100644
--- a/metadata/md5-cache/www-client/vivaldi-2.8.1664.40_p1
+++ b/metadata/md5-cache/www-client/vivaldi-2.8.1664.40_p1
@@ -4,11 +4,11 @@ DESCRIPTION=A browser for our friends
 EAPI=7
 HOMEPAGE=https://vivaldi.com/
 IUSE=kernel_linux +l10n_am +l10n_ar +l10n_be +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_en-US +l10n_eo +l10n_es +l10n_es-419 +l10n_es-PE +l10n_et +l10n_eu +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_fy +l10n_gl +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_hy +l10n_id +l10n_io +l10n_is +l10n_it +l10n_ja +l10n_jbo +l10n_ka +l10n_kn +l10n_ko +l10n_ku +l10n_lt +l10n_lv +l10n_mk +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_nn +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sc +l10n_sk +l10n_sl +l10n_sq +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_vi +l10n_zh-CN +l10n_zh-TW
-KEYWORDS=-* ~amd64 ~arm ~x86
+KEYWORDS=-* amd64 ~arm x86
 LICENSE=Vivaldi
 RDEPEND=dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/speex net-print/cups sys-apps/dbus sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/libXtst x11-libs/pango[X]
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=amd64? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.40-1_amd64.deb -> vivaldi-2.8.1664.40_p1-amd64.deb ) arm? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.40-1_armhf.deb -> vivaldi-2.8.1664.40_p1-armhf.deb ) x86? ( https://downloads.vivaldi.com/stable/vivaldi-stable_2.8.1664.40-1_i386.deb -> vivaldi-2.8.1664.40_p1-i386.deb )
 _eclasses_=chromium-2	92ff174aa2b13d6ea0c4539533f0b2de	eutils	6e6c2737b59a4b982de6fb3ecefd87f8	linux-info	953c3b1c472dcadbf62098a9301327f2	multilib	1d91b03d42ab6308b5f4f6b598ed110e	toolchain-funcs	2f8b8f320bee13b71a8a54cc6d09e08a	unpacker	3cd8bad0d31e525cd26be1bfa4e61631	xdg-utils	ff2ff954e6b17929574eee4efc5152ba
-_md5_=6ad3d712e255fffc3879cdf00b491412
+_md5_=c71bed7d90a1783a268c7e21ac0c7fba
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index f0cba0b59581..6461c69ac8fe 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -15104,7 +15104,7 @@ net-libs/libmnl 1.0.3-r1 1.0.4: Minimalistic netlink library
 net-libs/libmrss 0.19.2: A C-library for parsing and writing RSS 0.91/0.92/1.0/2.0 files or streams
 net-libs/libnatpmp 20110808-r1 20130911 20140401-r1 20150609: An alternative protocol to UPnP IGD specification
 net-libs/libndp 1.7: Library for Neighbor Discovery Protocol
-net-libs/libnet 1.0.2a-r5 1.0.2a-r6 1.2_rc3-r1: library providing an API for commonly used low-level network functions
+net-libs/libnet 1.0.2a-r5 1.0.2a-r6 1.2_rc3-r1 1.2.9999: library providing an API for commonly used low-level network functions
 net-libs/libnetfilter_acct 1.0.2 1.0.3: Userspace library providing interface to extended accounting infrastructure of NetFilter
 net-libs/libnetfilter_conntrack 1.0.4 1.0.5 1.0.6 1.0.7: programming interface (API) to the in-kernel connection tracking state table
 net-libs/libnetfilter_cthelper 1.0.0 1.0.0-r1: userspace library that provides the programming interface to the user-space helper infrastructure
@@ -18576,7 +18576,7 @@ www-client/seamonkey-bin 2.48 2.49.1_rc2: Mozilla Application Suite - web browse
 www-client/surf 2.0 9999: a simple web browser based on WebKit/GTK+
 www-client/surfraw 2.3.0-r1 2.3.0-r2 99999: A fast unix command line interface to WWW
 www-client/uget 2.2.0 2.2.1 9999: Download manager using gtk+ and libcurl
-www-client/vivaldi 2.7.1628.33_p1 2.8.1664.36_p1 2.8.1664.40_p1: A browser for our friends
+www-client/vivaldi 2.8.1664.40_p1: A browser for our friends
 www-client/vivaldi-snapshot 2.9.1675.11_p1: A browser for our friends
 www-client/w3m 0.5.3_p20180125 0.5.3_p20190105: Text based WWW browser, supports tables and frames
 www-client/w3mmee 0.3.2_p24-r10 0.3.2_p24-r11 0.3.2_p24-r12: A variant of w3m with support for multiple character encodings
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 9bd5ae0eee1b..de9cb4fce699 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 30 Sep 2019 07:06:14 +0000
+Mon, 30 Sep 2019 07:46:12 +0000