2018-04-13 14:29:16 UTC

18 files changed, 41 insertions, 82 deletions

diff --git a/metadata/md5-cache/app-admin/sshguard-1.7.1 b/metadata/md5-cache/app-admin/sshguard-1.7.1
deleted file mode 100644
index ce537cdb9cee..000000000000
--- a/metadata/md5-cache/app-admin/sshguard-1.7.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=6
-HOMEPAGE=http://sshguard.sourceforge.net/
-IUSE=ipfilter kernel_FreeBSD kernel_linux
-KEYWORDS=amd64 x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-1.7.1.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=6cfbac1b1ca5a597d8c705fe6405ee45
diff --git a/metadata/md5-cache/app-admin/sshguard-2.0.0 b/metadata/md5-cache/app-admin/sshguard-2.0.0
deleted file mode 100644
index fdfcfebf08cd..000000000000
--- a/metadata/md5-cache/app-admin/sshguard-2.0.0
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=6
-HOMEPAGE=http://sshguard.sourceforge.net/
-IUSE=ipfilter kernel_FreeBSD kernel_linux
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=kernel_linux? ( net-firewall/iptables ) kernel_FreeBSD? ( !ipfilter? ( sys-freebsd/freebsd-pf ) ) virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-2.0.0.tar.gz
-_md5_=3c787daff49eec20f439990c0bd4d394
diff --git a/metadata/md5-cache/app-admin/sshguard-2.0.99 b/metadata/md5-cache/app-admin/sshguard-2.0.99
deleted file mode 100644
index 863fb46cbfba..000000000000
--- a/metadata/md5-cache/app-admin/sshguard-2.0.99
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=sys-devel/flex
-DESCRIPTION=protects hosts from brute force attacks against ssh
-EAPI=6
-HOMEPAGE=http://sshguard.sourceforge.net/
-KEYWORDS=~amd64 ~x86 ~x86-fbsd
-LICENSE=BSD
-RDEPEND=virtual/logger
-SLOT=0
-SRC_URI=mirror://sourceforge/sshguard/sshguard-2.0.99.tar.gz
-_md5_=9cca15d27ebda6d9c26c4106134b562c
diff --git a/metadata/md5-cache/app-misc/notary-0.6.1 b/metadata/md5-cache/app-misc/notary-0.6.1
new file mode 100644
index 000000000000..fb03a3af8264
--- /dev/null
+++ b/metadata/md5-cache/app-misc/notary-0.6.1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=A project that allows anyone to have trust over arbitrary collections of data
+EAPI=6
+HOMEPAGE=https://github.com/theupdateframework/notary
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+SLOT=0
+SRC_URI=https://github.com/theupdateframework/notary/archive/v0.6.1.tar.gz -> notary-0.6.1.tar.gz
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=d61e3000f389cbe5ee74293a65a0d4b1
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
deleted file mode 100644
index ffe713da3da0..000000000000
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.24
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install preinst prepare setup
-DEPEND=>=virtual/jdk-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=6cb28624e7504c7ac433a8c198dde806
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
index d9561871b5e6..5cd2efccb120 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.28
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=466a50287d6629c3864557c848e828eb
+_md5_=6cb28624e7504c7ac433a8c198dde806
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.30
index 9608056ba801..0f544bfc322b 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.27
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.30
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-sol
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.27/src/apache-tomcat-8.5.27-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.30/src/apache-tomcat-8.5.30-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=466a50287d6629c3864557c848e828eb
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
index d9824a6c92be..1d64f3f586db 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.5
@@ -4,10 +4,10 @@ DESCRIPTION=Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=elibc_FreeBSD source elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=2b8827f71321f04c309f7a1cccf79d5d
+_md5_=156566c5990eb94a484ffdef37774979
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.7
index ce8183f6a2a3..7a4955d2378d 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.4
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.7
@@ -8,6 +8,6 @@ KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.4/src/apache-tomcat-9.0.4-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.7/src/apache-tomcat-9.0.7-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=2b8827f71321f04c309f7a1cccf79d5d
diff --git a/metadata/md5-cache/net-fs/minio-0_pre20180412 b/metadata/md5-cache/net-fs/minio-0_pre20180412
new file mode 100644
index 000000000000..0e498868c34c
--- /dev/null
+++ b/metadata/md5-cache/net-fs/minio-0_pre20180412
@@ -0,0 +1,12 @@
+DEFINED_PHASES=compile install prepare setup test unpack
+DEPEND=>=dev-lang/go-1.9
+DESCRIPTION=An Amazon S3 compatible object storage server
+EAPI=6
+HOMEPAGE=https://github.com/minio/minio
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/minio/minio/archive/f60765ac93013a554af1b55660764b49cc9b3221.tar.gz -> minio-0_pre20180412.tar.gz
+_eclasses_=golang-base	928887539e385bb489681b292f6b862f	golang-build	b66349c110e4ddd6203bbe8bf4ae05c1	golang-vcs-snapshot	913580335becddd3ebecefe852e47536	user	8bc2845510e2109af75e3eeac607ec81
+_md5_=75c2af2992db0a52c4bff883dd5844c2
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.24 b/metadata/md5-cache/www-servers/tomcat-8.5.24
deleted file mode 100644
index 6007828e398f..000000000000
--- a/metadata/md5-cache/www-servers/tomcat-8.5.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 app-admin/pwgen >=virtual/jdk-1.7 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
-DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
-EAPI=6
-HOMEPAGE=https://tomcat.apache.org/
-IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.24/src/apache-tomcat-8.5.24-src.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=9786f3dbd3756eec4a29b3ba69628786
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.28 b/metadata/md5-cache/www-servers/tomcat-8.5.28
index 7558f9add2c5..a4e135ebe0ce 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.28
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.28
@@ -4,11 +4,11 @@ DESCRIPTION=Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.28/src/apache-tomcat-8.5.28-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=232c91483f6417d0cf557eb0816fec27
+_md5_=2e621092f378c0dffc70f281c3690d62
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.27 b/metadata/md5-cache/www-servers/tomcat-8.5.30
index 799b9fe52ab8..4c7f02b659e2 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.27
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.30
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.5 >=dev-java/tomcat-servlet-api-8.5:3.1 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.7 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=8.5
-SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.27/src/apache-tomcat-8.5.27-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.30/src/apache-tomcat-8.5.30-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=232c91483f6417d0cf557eb0816fec27
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.5 b/metadata/md5-cache/www-servers/tomcat-9.0.5
index 50b69b002449..0006c0439e13 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.5
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.5
@@ -4,11 +4,11 @@ DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Contai
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
-KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
 RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.5:4.0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.5/src/apache-tomcat-9.0.5-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=5a8e9b9ae5035d544d14c30e3ecfeb8e
+_md5_=deffc7224c134cb7a3e81543e46792e4
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.4 b/metadata/md5-cache/www-servers/tomcat-9.0.7
index cff1ca6894e9..da837595d6f0 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.4
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.7
@@ -1,14 +1,14 @@
 DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.4:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
+DEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.7:4.0 app-admin/pwgen >=virtual/jdk-1.8 test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 >=dev-java/javatoolkit-0.3.0-r2
 DESCRIPTION=Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
 EAPI=6
 HOMEPAGE=https://tomcat.apache.org/
 IUSE=extra-webapps elibc_FreeBSD doc source test elibc_FreeBSD
 KEYWORDS=~amd64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=Apache-2.0
-RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.4:4.0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RDEPEND=dev-java/eclipse-ecj:4.5 =dev-java/tomcat-servlet-api-9.0.7:4.0 !<dev-java/tomcat-native-1.1.24 >=virtual/jre-1.8 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 RESTRICT=test
 SLOT=9
-SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.4/src/apache-tomcat-9.0.4-src.tar.gz
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.7/src/apache-tomcat-9.0.7-src.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	63392afb034aad67f17fa129019eb4d9	java-ant-2	ea15ab9e838d1062abd6b53de2045d50	java-pkg-2	c4e6af2574fd1dc79b43a6e27af4b5fb	java-utils-2	0ee72667014428e01a01df2345244cf3	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	prefix	e51c7882b7b721e54e684f7eb143cbfe	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	user	8bc2845510e2109af75e3eeac607ec81	vcs-clean	2a0f74a496fa2b1552c4f3398258b7bf	versionator	ce21313503c41896ebcd7d58b0607e37
 _md5_=5a8e9b9ae5035d544d14c30e3ecfeb8e
diff --git a/metadata/pkg_desc_index b/metadata/pkg_desc_index
index 95c2736838e1..9ee8cbfb441c 100644
--- a/metadata/pkg_desc_index
+++ b/metadata/pkg_desc_index
@@ -121,7 +121,7 @@ app-admin/rsyslog 8.32.0-r4: An enhanced multi-threaded syslogd with database su
 app-admin/sagan 0.2.3 1.0.0_rc3: Sagan is a multi-threaded, real time system and event log monitoring system
 app-admin/sagan-rules 20130430 20140617: Rules for Sagan log analyzer
 app-admin/setools 3.3.8-r7 4.0.1 4.1.1: Policy Analysis Tools for SELinux
-app-admin/sshguard 1.7.1 2.1.0-r1: protects hosts from brute force attacks against ssh
+app-admin/sshguard 2.1.0-r1: protects hosts from brute force attacks against ssh
 app-admin/sudo 1.8.20_p2 1.8.22-r2: Allows users or groups to run commands as other users
 app-admin/superadduser 1.0.9: Interactive adduser script from Slackware
 app-admin/supervisor 3.1.4: A system for controlling process state under UNIX
@@ -2798,7 +2798,7 @@ dev-java/tomcat-jstl-el 1.2.5-r1: JSP Standard Tag Library (JSTL) - EL jar
 dev-java/tomcat-jstl-impl 1.2.5-r1: JSP Standard Tag Library (JSTL) - Implementation jar
 dev-java/tomcat-jstl-spec 1.2.5-r1: JSP Standard Tag Library (JSTL) - Specification jar
 dev-java/tomcat-native 1.2.14: Native APR library for Tomcat
-dev-java/tomcat-servlet-api 3 4.1.36 5.5.27-r1 5.5.34 6.0.44-r1 6.0.53 7.0.82 8.0.48 8.5.23 8.5.24: Tomcat's Servlet API 3.1/JSP API 2.3/EL API 3.0 implementation
+dev-java/tomcat-servlet-api 3 4.1.36 5.5.27-r1 5.5.34 6.0.44-r1 6.0.53 7.0.82 8.0.48 8.5.23 8.5.28 9.0.5: Tomcat's Servlet API 4.0/JSP API 2.4?/EL API 3.1? implementation
 dev-java/toolbar 1.1.0-r2: An improved version of JToolBar
 dev-java/touchgraph-graphlayout 1.22-r1: TouchGraph provides a set of interfaces for graph visualization
 dev-java/treelayout 1.0.2: Efficiently create compact tree layouts in Java
@@ -10493,7 +10493,7 @@ www-servers/pound 2.7f-r1: A http/https reverse-proxy and load-balancer
 www-servers/puma 3.11.0: a simple, fast, threaded, and highly concurrent HTTP 1.1 server for Ruby/Rack
 www-servers/spawn-fcgi 1.6.3-r1: A FCGI spawner for lighttpd and cherokee and other webservers
 www-servers/thttpd 2.27.1: Fork of thttpd, a small, fast, multiplexing webserver
-www-servers/tomcat 7.0.82 8.0.48 8.5.24: Tomcat Servlet-3.1/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+www-servers/tomcat 7.0.82 8.0.48 8.5.28 9.0.5: Tomcat Servlet-4.0/JSP-2.4?/EL-3.1?/WebSocket-1.2?/JASPIC-1.1 Container
 www-servers/tornado 4.4.2-r1: Python web framework and asynchronous networking library
 www-servers/uwsgi 2.0.15-r2 2.0.17: uWSGI server for Python web applications
 www-servers/varnish 4.0.5 4.1.8 5.1.3: Varnish is a state-of-the-art, high-performance HTTP accelerator
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 739f8faca82a..e6fc63085564 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Fri, 13 Apr 2018 13:49:08 +0000
+Fri, 13 Apr 2018 14:29:16 +0000
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index b60404b61d41..5b0c6eacbb1a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -117,7 +117,6 @@ app-admin/sagan:pcap - Add support for network packet capture via net-libs/libpc
 app-admin/sagan:smtp - Build witch SMTP (E-Mail) support
 app-admin/sagan:snort - Add support to interact with Snort IDE using net-analyzer/snortsam'
 app-admin/sagan-rules:lognorm - Install normalize rules support with dev-libs/liblognorm
-app-admin/sshguard:ipfilter - Enable ipfilter firewall support (only for *bsd)
 app-admin/sudo:gcrypt - Use SHA2 from dev-libs/libgcrypt instead of sudo's internal SHA2
 app-admin/sudo:offensive - Let sudo print insults when the user types the wrong password
 app-admin/sudo:openssl - Use SHA2 from dev-libs/openssl instead of sudo's internal SHA2