diff --git a/Manifest.files.gz b/Manifest.files.gz
index 89af43dd466c..f409b15b1b0f 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index 60e57a6fe457..0ffc523de91e 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/atool/atool-0.39.0-r1.ebuild b/app-arch/atool/atool-0.39.0-r1.ebuild
new file mode 100644
index 000000000000..29071b4b90aa
--- /dev/null
+++ b/app-arch/atool/atool-0.39.0-r1.ebuild
@@ -0,0 +1,16 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Script for managing file archives of various types"
+HOMEPAGE="https://www.nongnu.org/atool/"
+SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+ !app-text/adiff"
diff --git a/app-arch/atool/atool-0.39.0.ebuild b/app-arch/atool/atool-0.39.0.ebuild
index 52a379d421a1..a6badc7cca4b 100644
--- a/app-arch/atool/atool-0.39.0.ebuild
+++ b/app-arch/atool/atool-0.39.0.ebuild
@@ -1,13 +1,13 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="4"
DESCRIPTION="a script for managing file archives of various types"
-HOMEPAGE="http://www.nongnu.org/atool/"
+HOMEPAGE="https://www.nongnu.org/atool/"
SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.gz"
-LICENSE="GPL-2"
+LICENSE="GPL-2+"
SLOT="0"
KEYWORDS="amd64 ppc x86"
IUSE=""
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index cc7dac548f2b..f37407a04371 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/flatzebra/flatzebra-0.1.6.ebuild b/dev-games/flatzebra/flatzebra-0.1.6.ebuild
index a8ca6daebdbc..a2656a4bfba0 100644
--- a/dev-games/flatzebra/flatzebra-0.1.6.ebuild
+++ b/dev-games/flatzebra/flatzebra-0.1.6.ebuild
@@ -1,12 +1,12 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=5
inherit eutils
DESCRIPTION="A generic game engine for 2D double-buffering animation"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
+HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
+SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 0d54e67661e9..ac3c6dbafd4d 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/apptools/Manifest b/dev-python/apptools/Manifest
deleted file mode 100644
index 7aad92cfa4c2..000000000000
--- a/dev-python/apptools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST apptools-4.3.0.tar.gz 291137 BLAKE2B e86ea970fae0c1e5b3961c6cc2cafccdd43d6135b9c524d533a09e1f631c78cbc4cec841ac1737695fe1fce957f19823232441d1ff3470f33f4e043e03f7c373 SHA512 ba3ad2c157bd1837522d8edbb834cded0dd6d9c2440ff54af0abfa0716f0485b3519edf79a74c64133d963b1afc769e743688a3bf60fd1d2fa384e8e3bc399cd
diff --git a/dev-python/apptools/apptools-4.3.0.ebuild b/dev-python/apptools/apptools-4.3.0.ebuild
deleted file mode 100644
index 8f9bee2de9ef..000000000000
--- a/dev-python/apptools/apptools-4.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Application tools"
-HOMEPAGE="http://docs.enthought.com/apptools/
- https://github.com/enthought/apptools
- https://pypi.org/project/apptools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/traitsui[${PYTHON_USEDEP}]
- >=dev-python/traits-4[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- ${RDEPEND}
- >=dev-python/pyface-4[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- sci-visualization/mayavi[${PYTHON_USEDEP}]
- dev-python/traits[${PYTHON_USEDEP}]
- dev-python/traitsui[${PYTHON_USEDEP}]
- )"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- # Ignore test file that imports a long deprecated module of traits
- VIRTUALX_COMMAND="nosetests -I test_state_pickler.py" virtualmake
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/apptools/metadata.xml b/dev-python/apptools/metadata.xml
deleted file mode 100644
index 0e2d38b9af66..000000000000
--- a/dev-python/apptools/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-
-
-
- The Enthought Tool Suite AppTools project includes a set of
- packages that Enthought has found useful in creating a number of
- applications. They implement functionality that is commonly needed
- by many applications.
-
-
- apptools
-
-
diff --git a/dev-python/blockcanvas/Manifest b/dev-python/blockcanvas/Manifest
deleted file mode 100644
index 7a796e96620f..000000000000
--- a/dev-python/blockcanvas/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST blockcanvas-4.0.3.tar.gz 1125887 BLAKE2B ac2548c68090ce042758b04c7108710f8173a6ff9c948dc9bb164b1f8cc738f276f7ae16f5cba44cb49beeb16bd637d23b50928cd4cc08f5ca1617d0585e613d SHA512 c74bebceafca28646186c72efd20168113cc62ac17b598e12074d029dce1803a601aafba31b5a305bdbf6d74d5d7bf29614b917e21bd54df7db123701ea770c1
diff --git a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild b/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
deleted file mode 100644
index 98526227197a..000000000000
--- a/dev-python/blockcanvas/blockcanvas-4.0.3-r1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Numerical modeling"
-HOMEPAGE="http://docs.enthought.com/blockcanvas/
- https://github.com/enthought/blockcanvas
- https://pypi.org/project/blockcanvas/"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-RESTRICT=test
-
-RDEPEND=">=dev-python/apptools-4[${PYTHON_USEDEP}]
- >=dev-python/chaco-4[${PYTHON_USEDEP}]
- >=dev-python/codetools-4[${PYTHON_USEDEP}]
- >=dev-python/etsdevtools-4[${PYTHON_USEDEP}]
- >=dev-python/pyface-4[${PYTHON_USEDEP}]
- >=dev-python/scimath-4[${PYTHON_USEDEP}]
- >=dev-python/traitsui-4[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- dev-python/docutils[${PYTHON_USEDEP}]
- dev-python/greenlet[${PYTHON_USEDEP}]
- dev-python/pillow[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- ${RDEPEND}
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-DOCS=( docs/{notes.txt,readme.txt} )
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- VIRTUALX_COMMAND="nosetests -v" virtualmake
-}
-
-python_install_all() {
- use doc && local DOHTML_DOCS=( docs/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/blockcanvas/metadata.xml b/dev-python/blockcanvas/metadata.xml
deleted file mode 100644
index ce3a215156e5..000000000000
--- a/dev-python/blockcanvas/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- sci@gentoo.org
- Gentoo Science Project
-
-
- The Enthought Tool Suite BlockCanvas project provides a visual
- environment for creating simulation experiments, where function
- and data are separated. Thus, you can define your simulation
- algorithm by visually connecting function blocks into a data flow
- network, and then run it with various data sets (known as
- "contexts"); likewise, you can use the same context in a different
- functional simulation.
-
-
diff --git a/dev-python/chaco/Manifest b/dev-python/chaco/Manifest
deleted file mode 100644
index 972ca8ebda73..000000000000
--- a/dev-python/chaco/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST chaco-4.5.0.tar.gz 409562 BLAKE2B e2e8b51924a8df036521d5b6718449f2b6ec37bc8f4de265b51f5e960d34b42cbc1cda6acdbf6a735a153d40637a4bdf6eba99fb6eb70897a3249e79b98f7d2d SHA512 66e1d82bbbf74e143e42f92eec7c83abc6f0eef488629947422a8ab2140a5a5bacf0f4e2a79f2acb8670417c9a620c9e85f295729525e011b8a09a1ff916e8c6
diff --git a/dev-python/chaco/chaco-4.5.0.ebuild b/dev-python/chaco/chaco-4.5.0.ebuild
deleted file mode 100644
index 798acf87ae0e..000000000000
--- a/dev-python/chaco/chaco-4.5.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx flag-o-matic
-
-DESCRIPTION="Enthought Tool Suite: Interactive plotting toolkit"
-HOMEPAGE="http://docs.enthought.com/chaco/
- https://github.com/enthought/chaco
- https://pypi.org/project/chaco/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/enable-4.4.0[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- >=dev-python/traitsui-4[${PYTHON_USEDEP}]"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-python_prepare_all() {
- append-cflags -fno-strict-aliasing
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib || die
- VIRTUALX_COMMAND="nosetests" virtualmake
-}
diff --git a/dev-python/chaco/metadata.xml b/dev-python/chaco/metadata.xml
deleted file mode 100644
index cc6bb8178e7d..000000000000
--- a/dev-python/chaco/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- Chaco is a Python plotting application toolkit and a part of
- Enthought Tool Suite. It is meant to facilitate writing plotting
- applications of all levels of complexity, from simple scripts with
- hard-coded data to large plotting programs with complex data
- interrelationships and a multitude of interactive tools. While Chaco
- generates nice static plots for publication and presentation
- purposes, its components are all designed to be work well for
- interactive data visualization.
-
-
- chaco
-
-
diff --git a/dev-python/codetools/Manifest b/dev-python/codetools/Manifest
deleted file mode 100644
index 1edcb90bbfe7..000000000000
--- a/dev-python/codetools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST codetools-4.2.0.tar.gz 117891 BLAKE2B 970d56037fdad518aa8975805a70238aa417a74649fa94c8383e2828447860b7a4d9467c54adf7f519e0f07e8852f0639486c1d3b5f80ccc6afc0d0d18da7d8a SHA512 8b63b9cb65966db72f3d2b054559fadf3008a4f4a7fc66ff12b046ca18568694c9d11066d6450e38b053b73df31c8a136729d7052bf8e21f287eac220ddf5dbb
diff --git a/dev-python/codetools/codetools-4.2.0.ebuild b/dev-python/codetools/codetools-4.2.0.ebuild
deleted file mode 100644
index fe151340e438..000000000000
--- a/dev-python/codetools/codetools-4.2.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Code analysis and execution tools"
-HOMEPAGE="http://docs.enthought.com/codetools/
- https://github.com/enthought/codetools
- https://pypi.org/project/codetools/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-IUSE="test"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-LICENSE="BSD"
-
-RDEPEND="
- dev-python/numpy[${PYTHON_USEDEP}]
- >=dev-python/scimath-4[${PYTHON_USEDEP}]
- >=dev-python/traits-4[${PYTHON_USEDEP}]"
-
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/blockcanvas[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- virtual/python-futures[${PYTHON_USEDEP}]
- )"
-
-python_test() {
- VIRTUALX_COMMAND="nosetests" virtualmake -e with_mask_test_case
-}
diff --git a/dev-python/codetools/metadata.xml b/dev-python/codetools/metadata.xml
deleted file mode 100644
index 88fb0b2e0e85..000000000000
--- a/dev-python/codetools/metadata.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
-
-
-
- The CodeTools project from the Enthought Tool Suite
- includes packages that simplify meta-programming
- and help the programmer separate data from code in Python. This
- library contains classes that allow defining simple snippets, or
- "blocks", of Python code, analyze variable dependencies in the code
- block, and use these dependencies to construct or restrict an
- execution graph. These (restricted) code blocks can then be executed
- in any namespace. However, this project also provides a
- Traits-event-enhanced namespace, called a "context", which can be used
- in place of a vanilla namespace to allow actions to be performed
- whenever variables are assigned or retrieved from the namespace. This
- project is used as the foundation for the BlockCanvas project.
-
-
- codetools
-
-
diff --git a/dev-python/enable/Manifest b/dev-python/enable/Manifest
deleted file mode 100644
index 0c40428cccdc..000000000000
--- a/dev-python/enable/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST enable-4.7.1.tar.gz 2728889 BLAKE2B 2952c1772ea902b2a040a5dbc1ade4fcb41f38da41cb9cfd3a574d16397fcceedb5d2216e19bd14ca9881ff27efa93ec0fe4b94db8f3baedf174fe062c825f1e SHA512 49ca414d1273fb5ddcb1732e621f91a5ac49ff02d63b5b36b8d9e28dd737eb4a312f35345fc29db555db1c6e0e8c9bf2204f8662b43a2761db6c2d656c6b2140
diff --git a/dev-python/enable/enable-4.7.1.ebuild b/dev-python/enable/enable-4.7.1.ebuild
deleted file mode 100644
index 8354cdf87549..000000000000
--- a/dev-python/enable/enable-4.7.1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx flag-o-matic
-
-DESCRIPTION="Enthought Tool Suite: Drawing and interaction packages"
-HOMEPAGE="http://docs.enthought.com/enable/
- https://pypi.org/project/enable
- https://github.com/enthought/enable"
-SRC_URI="https://github.com/enthought/enable/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RESTRICT="test" # Until https://github.com/enthought/enable/issues/303 is solved
-
-RDEPEND="
- dev-python/apptools[${PYTHON_USEDEP}]
- dev-python/kiwisolver[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/reportlab[${PYTHON_USEDEP}]
- >=dev-python/traitsui-4[${PYTHON_USEDEP}]
- media-libs/freetype:2
- virtual/opengl
- virtual/glu
- x11-libs/libX11
-"
-DEPEND="${RDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-lang/swig:0
- dev-python/cython[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- dev-python/coverage[${PYTHON_USEDEP}]
- dev-python/fonttools[${PYTHON_USEDEP}]
- dev-python/hypothesis[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/pyface[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )
-"
-
-DISTUTILS_IN_SOURCE_BUILD=1
-
-python_prepare_all() {
- append-cflags -fno-strict-aliasing
-
- sed -e 's:html_favicon = "et.ico":html_favicon = "_static/et.ico":' \
- -i docs/source/conf.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- pushd "${BUILD_DIR}"/lib > /dev/null
- # https://github.com/enthought/enable/issues/303
- virtx coverage run -m nose.core enable -v
- virtx coverage run -a -m nose.core kiva -v
- popd > /dev/null
-}
-
-python_install_all() {
- use doc && local HTML_DOCS=( docs/build/html/. )
-
- use examples && local EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/enable/metadata.xml b/dev-python/enable/metadata.xml
deleted file mode 100644
index c650da52e032..000000000000
--- a/dev-python/enable/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- The Enable project from the Enthought Tool Suite provides two
- related multi-platform packages for drawing GUI objects:
- * Enable: An object drawing library that supports containment and
- event notification.
- * Kiva: A multi-platform DisplayPDF vector drawing engine.
-
-
- enthought/enable
- enable
-
-
diff --git a/dev-python/enaml/Manifest b/dev-python/enaml/Manifest
deleted file mode 100644
index e52a7059aa77..000000000000
--- a/dev-python/enaml/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST enaml-0.10.2.tar.gz 1568147 BLAKE2B 627e34f0703a54a7298c405406c2d96eb29f0d278c535f9e0a49d981dc8c4264a935fe34e97e4a1cfbcf4f4f1b9c24e00596bd850bdc87a29ef4429f9d620dce SHA512 fb78d5202fb595d28aae92455a70d4e6057c8a5daf05b4487f6e3aca38b7e495684ef6ccd4ce5bdd04e53be7231e6d39db73341005c12922d69ccfde38b84957
diff --git a/dev-python/enaml/enaml-0.10.2.ebuild b/dev-python/enaml/enaml-0.10.2.ebuild
deleted file mode 100644
index b1675570e66c..000000000000
--- a/dev-python/enaml/enaml-0.10.2.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_{5,6} )
-inherit distutils-r1 flag-o-matic virtualx
-
-DESCRIPTION="Enthought Tool Suite: framework for writing declarative interfaces"
-HOMEPAGE="https://github.com/nucleic/enaml https://pypi.org/project/enaml/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- dev-python/atom[${PYTHON_USEDEP}]
- dev-python/future[${PYTHON_USEDEP}]
- dev-python/setuptools[${PYTHON_USEDEP}]
- dev-python/kiwisolver[${PYTHON_USEDEP}]
- dev-python/ply[${PYTHON_USEDEP}]
- dev-python/PyQt5[${PYTHON_USEDEP}]
- dev-python/QtPy[${PYTHON_USEDEP}]
- >=x11-libs/qscintilla-2.10.3
-"
-DEPEND="${RDEPEND}
- test? (
- dev-python/python-dateutil[${PYTHON_USEDEP}]
- dev-python/nose[${PYTHON_USEDEP}]
- )
-"
-
-# The testsuite antagonises gentoo conventions far beyond what can currently be dealt with
-# It also passes all once run
-RESTRICT="test"
-
-# Doc build now fails, missing required folder, use doc removed for now
-# https://github.com/nucleic/enaml/issues/170
-#python_compile_all() {
-# use doc && emake -C docs html
-#}
-
-python_prepare_all() {
- append-flags -fno-strict-aliasing
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- export ETS_TOOLKIT=qt5
- VIRTUALX_COMMAND="nosetests -v" virtualmake
-}
-
-python_install_all() {
-# use doc && local HTML_DOCS=( docs/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/enaml/metadata.xml b/dev-python/enaml/metadata.xml
deleted file mode 100644
index 15d1b80895d1..000000000000
--- a/dev-python/enaml/metadata.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-
-
-
-
- python@gentoo.org
- Python
-
-
- Enaml is a framework for writing declarative user interfaces in
- Python. It provides a Yaml-ish/Pythonic syntax language for
- declaring a ui that binds and reacts to changes in the user's
- models. Code can freely call back and forth between Python and Enaml.
-
-
- enaml
-
-
diff --git a/dev-python/encore/Manifest b/dev-python/encore/Manifest
deleted file mode 100644
index 2642c8830d2b..000000000000
--- a/dev-python/encore/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST encore-0.5.1.tar.gz 71248 BLAKE2B f50c42fa4aad56cfa4f9440bb249812fdee575dd65178091aaf4cb7a381439b797709bc3857db04cdd0cb8afcf397070a895bf7d5909857f5cb8dd8670cd55eb SHA512 410d37bd326ac5b8433dd5896c3e167387e83380cc55efa7405b4c3f918108cee60e6d3c78c3ff41aa2b1f46939cb3c4e2e495b9f77a9c2483a77e1973bd2d17
diff --git a/dev-python/encore/encore-0.5.1.ebuild b/dev-python/encore/encore-0.5.1.ebuild
deleted file mode 100644
index 756162a5ade8..000000000000
--- a/dev-python/encore/encore-0.5.1.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 pypy )
-
-inherit distutils-r1
-
-DESCRIPTION="Enthought Tool Suite: collection of core-level utility modules"
-HOMEPAGE="https://github.com/enthought/encore"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="virtual/python-futures[${PYTHON_USEDEP}]
- dev-python/requests[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/mock[${PYTHON_USEDEP}] )"
-
-PATCHES=( "${FILESDIR}"/${P}-pypy-tests.patch )
-
-python_test() {
- "${PYTHON}" -m unittest discover ./${PN}/events || die
- # PYTHONPATH goes astray & '-m unittest discover' loses its way. nose works
- # https://github.com/enthought/encore/issues/84
- # tests for storage simply aren't written to cater to pypy
- if [[ "${EPYTHON}" == python2.7 ]]; then
- nosetests ./${PN}/storage || die
- fi
-}
diff --git a/dev-python/encore/files/encore-0.5.1-pypy-tests.patch b/dev-python/encore/files/encore-0.5.1-pypy-tests.patch
deleted file mode 100644
index c7673efa7c4c..000000000000
--- a/dev-python/encore/files/encore-0.5.1-pypy-tests.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -ur encore-0.5.1.orig/encore/events/tests/test_event_manager.py encore-0.5.1/encore/events/tests/test_event_manager.py
---- encore/events/tests/test_event_manager.py 2014-01-06 22:40:24.000000000 +0800
-+++ encore/events/tests/test_event_manager.py 2014-05-05 17:56:16.606026933 +0800
-@@ -10,7 +10,7 @@
- import mock
- import weakref
- import threading
--
-+import sys
- # Local imports.
- from encore.events.event_manager import EventManager, BaseEvent
- from encore.events.api import (get_event_manager, set_event_manager,
-@@ -429,6 +429,7 @@
- self.evt_mgr.emit(BaseEvent())
- self.assertEqual(data, [1])
-
-+ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "test written for py2 garbage collection methods")
- def test_method_weakref(self):
- """ Test if methods do not prevent garbage collection of objects.
- """
-@@ -464,6 +465,7 @@
- self.evt_mgr.emit(obj)
- self.assertEqual(data, [1, 2])
-
-+ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "test written for py2 garbage collection methods")
- def test_method_collect(self):
- """ Test if object garbage collection disconnects listener method.
- """
-@@ -481,6 +483,7 @@
- self.assertEqual(data, [])
- self.assertEqual(len(list(self.evt_mgr.get_listeners(BaseEvent))), 0)
-
-+ @unittest.skipIf(hasattr(sys, 'pypy_version_info'), "test written for py2 garbage collection methods")
- def test_method_disconnect(self):
- """ Test if method disconnect works.
- """
diff --git a/dev-python/encore/metadata.xml b/dev-python/encore/metadata.xml
deleted file mode 100644
index dfbd48dfbd2a..000000000000
--- a/dev-python/encore/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-
-
-
-
-
- This package consists of a collection of core utility packages
- useful for building Python applications. This package is intended to
- be at the bottom of the software stack and have zero required
- external dependencies aside from the Python Standard Library.
-
-
- encore
- enthought/encore
-
-
diff --git a/dev-python/envisage/Manifest b/dev-python/envisage/Manifest
deleted file mode 100644
index 45278cb27af4..000000000000
--- a/dev-python/envisage/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST envisage-4.4.0.tar.gz 192529 BLAKE2B 2ce1903d082d5762d5c3d3924c8bfafd4d70d7114461a044bfe55e48bf2ce331119ae649bcbfef143360a67fd54492d7373314681b28de66e47df6d54b888cbe SHA512 7cc8fa82ea9bfd53f1a6cc90551d97972dd4b7abe9476515ea617ab6a32d7f2f65b2815ed934633f96b0f1445b763b9350e5d0e37ed99768c9a2ca32e588f91f
diff --git a/dev-python/envisage/envisage-4.4.0.ebuild b/dev-python/envisage/envisage-4.4.0.ebuild
deleted file mode 100644
index 4065db128cc1..000000000000
--- a/dev-python/envisage/envisage-4.4.0.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# py2.6 fails testsuite horribly
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Extensible application framework"
-HOMEPAGE="http://docs.enthought.com/envisage/
- https://github.com/enthought/envisage
- https://pypi.org/project/envisage/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND=">=dev-python/traits-4[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- >=dev-python/traits-4[${PYTHON_USEDEP}]
- dev-python/apptools[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-# tests are buggy version after version
-RESTRICT=test
-
-python_test() {
- VIRTUALX_COMMAND="nosetests" virtualmake
-}
diff --git a/dev-python/envisage/metadata.xml b/dev-python/envisage/metadata.xml
deleted file mode 100644
index d2835ba4a5f0..000000000000
--- a/dev-python/envisage/metadata.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-
-
-
-
-
- Envisage is a Python-based framework for building extensible
- applications, that is, applications whose functionality can be
- extended by adding "plug-ins". Envisage provides a standard
- mechanism for features to be added to an application, whether by the
- original developer or by someone else. In fact, when you build an
- application using Envisage, the entire application consists
- primarily of plug-ins. In this respect, it is similar to the Eclipse
- and Netbeans frameworks for Java applications.
-
-
- envisage
-
-
diff --git a/dev-python/ets/Manifest b/dev-python/ets/Manifest
deleted file mode 100644
index 0a5db01289dd..000000000000
--- a/dev-python/ets/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST ets-4.4.1.tar.gz 5074 BLAKE2B be844d7e1b7b7921883835fc9f640c105f5a66723b4dffa2bd4508804eac8b53ece40da1227be9623ddb36b2e573ec0ee5139a67a497c92cf14a543e1e98913e SHA512 50e8b0a4777e2ba433366ea6a34ef7c31ed9f41b2d662360839aa2ebaf40b0a9c613b3c472518be0931c5f523a7b383a382e9bd401e7b713f29337d4fd3a2c35
diff --git a/dev-python/ets/ets-4.4.1-r1.ebuild b/dev-python/ets/ets-4.4.1-r1.ebuild
deleted file mode 100644
index 77b4992bc69e..000000000000
--- a/dev-python/ets/ets-4.4.1-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Meta package for the Enthought Tool Suite"
-HOMEPAGE="https://pypi.org/project/ets/
- https://github.com/enthought/ets"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-# see the setup_data.py file for version numbers
-RDEPEND="
- >=dev-python/apptools-4.2.0[${PYTHON_USEDEP}]
- >=dev-python/blockcanvas-4.0.3[${PYTHON_USEDEP}]
- >=dev-python/casuarius-1.1[${PYTHON_USEDEP}]
- >=dev-python/chaco-4.4.1[${PYTHON_USEDEP}]
- >=dev-python/codetools-4.2.0[${PYTHON_USEDEP}]
- >=dev-python/enable-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/enaml-0.6.8[${PYTHON_USEDEP}]
- >=dev-python/encore-0.4.0[${PYTHON_USEDEP}]
- >=dev-python/envisage-4.4.0[${PYTHON_USEDEP}]
- >=dev-python/etsdevtools-4.0.2[${PYTHON_USEDEP}]
- >=dev-python/etsproxy-0.1.2[${PYTHON_USEDEP}]
- >=dev-python/graphcanvas-4.0.2[${PYTHON_USEDEP}]
- >=sci-visualization/mayavi-4.3.0[${PYTHON_USEDEP}]
- >=dev-python/pyface-4.4.0[${PYTHON_USEDEP}]
- >=dev-python/scimath-4.1.2[${PYTHON_USEDEP}]
- >=dev-python/traits-4.4.0[${PYTHON_USEDEP}]
- >=dev-python/traitsui-4.4.0[${PYTHON_USEDEP}]"
-
-DEPEND=""
diff --git a/dev-python/ets/metadata.xml b/dev-python/ets/metadata.xml
deleted file mode 100644
index 8aae8f869565..000000000000
--- a/dev-python/ets/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- The Enthought Tool Suite (ETS) is a collection of Python components
- developed by Enthought and its partners to construct custom scientific
- applications. It includes a wide variety of components including:
- * An extensible application framework
- * Application building blocks
- * 2-D and 3-D graphics libraries
- * Scientific and math libraries
- * Developer tools
- This metapackage contains the dependencies for installing all of the
- components comprised by the suite.
-
-
- ets
-
-
diff --git a/dev-python/etsdevtools/Manifest b/dev-python/etsdevtools/Manifest
deleted file mode 100644
index d21a453375db..000000000000
--- a/dev-python/etsdevtools/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST etsdevtools-4.0.2.tar.gz 4222266 BLAKE2B 02ea4f465773d980c12b6e402098df8d43964e525a333b5837bd5840412be17659a62129d6405dcfb71bcf9158589f8801a066370e1f97b4ee57dcb9ba747349 SHA512 41e88997d74397f8780c47c87080629661790aefaabeb9463503f7a7331aefbb7ba42a9754382f43adf6143c28db999af70b287a221b8cdbd44b2b7443b2b23d
diff --git a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild b/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
deleted file mode 100644
index 80bca3a84fba..000000000000
--- a/dev-python/etsdevtools/etsdevtools-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,50 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Tools to support Python development"
-HOMEPAGE="https://github.com/enthought/etsdevtools
- http://docs.enthought.com/etsdevtools/
- https://pypi.org/project/etsdevtools/"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/traits[${PYTHON_USEDEP}]"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- ${RDEPEND}
- >=dev-python/traitsui-4[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- x11-apps/xhost
- )"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- VIRTUALX_COMMAND="nosetests -v" virtualmake
-}
-
-python_install_all() {
- find -name "*LICENSE*.txt" -delete
- use doc && dohtml -r docs/build/html/*
-
- if use examples; then
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/etsdevtools/metadata.xml b/dev-python/etsdevtools/metadata.xml
deleted file mode 100644
index aead8803ca37..000000000000
--- a/dev-python/etsdevtools/metadata.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-
-
-
- The ETSDevTools project from the Enthought Tool Suite includes a
- set of packages that can be used during the development of a
- software project, for understanding, debugging, testing, and
- inspecting code:
- * Enthought Developer Tool Suite (enthought.developer): A
- collection of utilities, designed to ease the development and
- debugging of Traits-based programs. They can be used as plug-ins
- to your Envisage application while you are developing it, and then
- removed when you are ready to release it.
- * Endo: A Traits-aware tool for processing API documentation of
- Python code. It extracts not only docstrings, but also plain
- comments that immediately precede variable assignments (both
- module-scope variables and class attributes).
- * enthought.guitest: A collection of utilities for unit testing
- user interfaces (translation of the Perl X11::GUITest and
- Win32::GuiTest modules).
- * enthought.testing: Scripts related to running unit tests, based
- on testoob, and also allowing running test suites in separate
- processes and aggregating the results.
- * enthought.debug: A collection of debugging tools, not to be
- included in production code. NOTE: These tools are functional, but
- are not being developed or supported. They have been mainly
- superceded by the tools in the Enthought Developer Tool Suite.
-
-
diff --git a/dev-python/etsproxy/Manifest b/dev-python/etsproxy/Manifest
deleted file mode 100644
index ecfdca7c312a..000000000000
--- a/dev-python/etsproxy/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST etsproxy-0.1.2.tar.gz 119646 BLAKE2B e738b134af8fe85bf7d2d15ca9931596bd693ea9ae3cb2c33c2ef69e3eb83981d8a19ec1bd08d4196b1c75bcc9965a1b8a4811636d7a2ab33687513f8c85c59f SHA512 f97a55127f6c1200a5a0bf581f24fc2718b8619c9cd137158c9c28511f2ad9c7a0a03998931bab25c193ed540d96d2325f390052591c8239ea7ea06cf5fd98ae
diff --git a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild b/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
deleted file mode 100644
index 06ad7e7a17f2..000000000000
--- a/dev-python/etsproxy/etsproxy-0.1.2-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Enthought Tool Suite: Proxy modules for backwards compatibility"
-HOMEPAGE="https://pypi.org/project/etsproxy/"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="!
-
-
-
-
- This is the ETS proxy package, it contains the proxy modules for all
- ETS projects which map the old enthought namespace imports to the
- namespace-refactored ETS packages. It should be only needed to
- switch from ETS-3 to ETS-4 packages.
-
-
diff --git a/dev-python/graphcanvas/Manifest b/dev-python/graphcanvas/Manifest
deleted file mode 100644
index f9515645be8e..000000000000
--- a/dev-python/graphcanvas/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST graphcanvas-4.0.2.tar.gz 6998 BLAKE2B fffce35127aa43716028f7c121e05783faebc151fd14c6dd0e18edf09330730ba97fe65790416c38ca3c9bc97b116b0d4a971e277a29e0f8f791a0c4b3cac5ab SHA512 090e493627d3f5639a73a005f75da6357745ae3af6351f15cd8b82a6a742835932599b9c2e955de20dcb94333eb5263b25e553e3a522ae9292cf677ca805246d
diff --git a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild b/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
deleted file mode 100644
index 5dc30a4db693..000000000000
--- a/dev-python/graphcanvas/graphcanvas-4.0.2-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Enthought Tool Suite: Interactive Graph (network) Visualization"
-HOMEPAGE="https://pypi.org/project/graphcanvas/"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples"
-
-RDEPEND="dev-python/networkx[${PYTHON_USEDEP}]
- >=dev-python/enable-4[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
- distutils-r1_python_install_all
- if use examples; then
- docompress -x usr/share/doc/${PF}/examples/
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-}
diff --git a/dev-python/graphcanvas/metadata.xml b/dev-python/graphcanvas/metadata.xml
deleted file mode 100644
index 7a38bb900964..000000000000
--- a/dev-python/graphcanvas/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/dev-python/pyface/Manifest b/dev-python/pyface/Manifest
deleted file mode 100644
index 256388865734..000000000000
--- a/dev-python/pyface/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST pyface-4.4.0.tar.gz 486490 BLAKE2B 59c3d2facb35da015a5625b8d5dbab8f6347d3e0d78cbe8fa15d9587cd9a62bb7a4dadb9ffdf86f3d9cb927ee378577320a23cfa63485fb74294e7ea2f874b85 SHA512 62c93cbd5e956d56c03580876d5f9191210beb3d81cf8fcd0dfc6b2919263e4bf01219f1372e292fcac4462eaffb45cf9cde62dbe16265134b357dabc47d719d
-DIST pyface-4.5.2.tar.gz 5089390 BLAKE2B 6615f9dd66dd8359df27ccc7ecab0678e0bf8370a81a43e74f7452b25e984ae806346dc56c61a2262c648cc580c59a095d06731f90d564b07596052efcfa15a2 SHA512 9f5f34960cce2180eec6c4ba1ef6e19069cb64a05db47644a70c1ff70b93927f80bc20f50cee72daf586722ad618bf19f53182986fef4b93ddb95d29f4a1fcbb
-DIST pyface-6.0.0.tar.gz 5238590 BLAKE2B df96cf46e54f540d8dde7c8c3c4844655e30275e4ce93563c2e1aab5aecf766db65c0f098aba532adb27f824d81a7b51e5d9e0635057d81e12870773f1a8c41c SHA512 df411f737555b016e7801d4cb870d8553834150829a9c3fc5f4d3993633c4aee83dd4b41c14f254373d0334f3eba6e9e0f05b3276de5fd99290e3128949def00
diff --git a/dev-python/pyface/metadata.xml b/dev-python/pyface/metadata.xml
deleted file mode 100644
index 04911f4f0ba6..000000000000
--- a/dev-python/pyface/metadata.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-
-
-
-
-
- The pyface project contains a toolkit-independent GUI abstraction
- layer, which is used to support the "visualization" features of the
- Traits package. Thus, you can write code in terms of the Traits API
- (views, items, editors, etc.), and let pyface and your selected
- toolkit and back-end take care of the details of displaying them.
- The following GUI backends are supported:
- * wxPython
- * PyQt
- * PySide
-
-
- pyface
- enthought/pyface
-
-
diff --git a/dev-python/pyface/pyface-4.4.0-r1.ebuild b/dev-python/pyface/pyface-4.4.0-r1.ebuild
deleted file mode 100644
index db5771d83587..000000000000
--- a/dev-python/pyface/pyface-4.4.0-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# https://github.com/enthought/pyface/issues/40 confirms only py2.7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Traits-capable windowing framework"
-HOMEPAGE="https://github.com/enthought/pyface"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- >=dev-python/traits-4.1[${PYTHON_USEDEP}]
- dev-python/wxpython:*[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/traitsui[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-python_test() {
- export ETS_TOOLKIT=wx
- # set nosetests to ignore tests unpassable by these vars.
- VIRTUALX_COMMAND="nosetests" virtualmake -v -I 'composite_grid_model_test_case*' \
- -I 'simple_grid_model_test_case*' \
- -I 'test_split_editor_area_pane*'
-}
diff --git a/dev-python/pyface/pyface-4.5.2-r1.ebuild b/dev-python/pyface/pyface-4.5.2-r1.ebuild
deleted file mode 100644
index c68ecf3f3836..000000000000
--- a/dev-python/pyface/pyface-4.5.2-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-# https://github.com/enthought/pyface/issues/40 confirms only py2.7
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Traits-capable windowing framework"
-HOMEPAGE="https://github.com/enthought/pyface"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
- >=dev-python/traits-4.1[${PYTHON_USEDEP}]
- dev-python/wxpython:*[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/traitsui[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-python_test() {
- export ETS_TOOLKIT=wx
- # set nosetests to ignore tests unpassable by these vars.
- VIRTUALX_COMMAND="nosetests" virtualmake -v -I 'composite_grid_model_test_case*' \
- -I 'simple_grid_model_test_case*' \
- -I 'test_split_editor_area_pane*'
-}
-
-python_install_all() {
- use examples && EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/pyface/pyface-6.0.0.ebuild b/dev-python/pyface/pyface-6.0.0.ebuild
deleted file mode 100644
index fc9f3de78859..000000000000
--- a/dev-python/pyface/pyface-6.0.0.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 ) # python3_{4,5,6} not supported by traits* deps
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Traits-capable windowing framework"
-HOMEPAGE="https://github.com/enthought/pyface"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
- >=dev-python/traits-4.1[${PYTHON_USEDEP}]
- || (
- (
- dev-python/pygments[${PYTHON_USEDEP}]
- dev-python/PyQt5[gui,network,opengl,printsupport,svg,test?,webengine,widgets,${PYTHON_USEDEP}]
- )
- dev-python/wxpython:*[${PYTHON_USEDEP}]
- )
-"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- dev-python/traitsui[${PYTHON_USEDEP}]
- dev-python/unittest2[${PYTHON_USEDEP}]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )
-"
-
-RESTRICT="test"
-
-python_install_all() {
- use examples && EXAMPLES=( examples/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/scimath/Manifest b/dev-python/scimath/Manifest
deleted file mode 100644
index c14652266315..000000000000
--- a/dev-python/scimath/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST scimath-4.1.2.tar.gz 119399 BLAKE2B 8f316ac90ec167d9563dafcdb0acbe2dae8ecea92a5c9c2dd126a0278bf3820c7bb87d7e9e597ed5a0c9ed8d154b7883cf31a6360adbb41c3654c8b3c10d5be8 SHA512 2ceeeca5402da2b8745e0af5dac6a470c47b80529ec56aeb758cea815785be8a38b4ee3a052780c532b474acc4bf36474dd67c802a94971f3010148987c24257
diff --git a/dev-python/scimath/metadata.xml b/dev-python/scimath/metadata.xml
deleted file mode 100644
index 80c1e798f10e..000000000000
--- a/dev-python/scimath/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
- sci@gentoo.org
- Gentoo Science Project
-
-
- The SciMath project from the Enthought Tool Suite includes
- packages to support scientific and mathematical calculations,
- beyond the capabilities offered by SciPy:
- * enthought.interpolate
- * enthought.mathematics
- * enthought.units
-
-
diff --git a/dev-python/scimath/scimath-4.1.2-r1.ebuild b/dev-python/scimath/scimath-4.1.2-r1.ebuild
deleted file mode 100644
index c67376ac54e2..000000000000
--- a/dev-python/scimath/scimath-4.1.2-r1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Scientific and mathematical tools"
-HOMEPAGE="http://docs.enthought.com/scimath/
- https://github.com/enthought/scimath
- https://pypi.org/project/scimath/"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-DISTUTILS_IN_SOURCE_BUILD=1
-
-RDEPEND=">=dev-python/traits-4.1[${PYTHON_USEDEP}]
- >=dev-python/traitsui-4.1[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- ${RDEPEND}
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- x11-apps/xhost
- )"
-
-python_compile_all() {
- use doc && emake -C docs html
-}
-
-python_test() {
- # ONE test assumes PYTHONPATH in its own dir!!!
- PYTHONPATH=build/lib/:build/lib/scimath/interpolate/
- VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
- use doc && HTML_DOCS=( docs/build/html/. )
- distutils-r1_python_install_all
-}
diff --git a/dev-python/traits/Manifest b/dev-python/traits/Manifest
deleted file mode 100644
index 2c5713d13715..000000000000
--- a/dev-python/traits/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST traits-4.5.0.tar.gz 4853612 BLAKE2B 6c3d83718751de1e0553487a45d073c285ada96686558133fe61472c29c3d4661e1c0bce68340bada9667f3f9e0c8ed11050a714bc0c55424dbd4ebd17e3ad8e SHA512 d506b4395395898eb824896d299bfcde609e100025cf9a55cd7d7c47615545efd3b007e46549e564fbfb2d5882b36ae676843f211f168b2557c504849c5ef582
-DIST traits-4.6.0.tar.gz 434937 BLAKE2B 91d457b411f78b74a077f3bfaa8e3f627d0ddb959784ba0ce9e07e3fc8b76cddcaee1fd7293d8336c4fc0630d49527fd29e1a9ccba6b724846069f6282c643e8 SHA512 0fce336696e4cbb1d4ba63a07ad42867cb179a9efa6c348623036bd6d2eb791302539ae89994b11acd5a9f1be42a0febeb517db1716342b78aa71ca1277fde99
diff --git a/dev-python/traits/metadata.xml b/dev-python/traits/metadata.xml
deleted file mode 100644
index 0e2713e3142b..000000000000
--- a/dev-python/traits/metadata.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-
-
-
-
- horea.christ@gmail.com
- Horea Christian
-
-
- proxy-maint@gentoo.org
- Proxy Maintainers
-
-
- The traits package from the Enthought Tool Suite provides a
- metaclass with special attributes that are called traits. A trait
- is a type definition that can be used for normal Python object
- attributes, giving the attributes some additional characteristics:
- * Initialization: A trait attribute can have a default value
- * Validation: A trait attribute is manifestly typed.
- * Delegation: The value of a trait attribute can be contained in another object
- * Notification: Setting the value of a trait attribute can fired callbacks
- * Visualization: With the TraitsUI package, GUIs can be generated automatically from traited objects.
-
-
- traits
-
-
diff --git a/dev-python/traits/traits-4.5.0.ebuild b/dev-python/traits/traits-4.5.0.ebuild
deleted file mode 100644
index aa0e34305e32..000000000000
--- a/dev-python/traits/traits-4.5.0.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
-HOMEPAGE="http://docs.enthought.com/traits/
- https://github.com/enthought/traits
- https://pypi.org/project/traits/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND} )"
-
-python_prepare_all() {
- sed -i -e "s/'-O3'//g" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib || die
- nosetests || die
-}
diff --git a/dev-python/traits/traits-4.6.0.ebuild b/dev-python/traits/traits-4.6.0.ebuild
deleted file mode 100644
index d3d48e925b4f..000000000000
--- a/dev-python/traits/traits-4.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Explicitly typed attributes for Python"
-HOMEPAGE="http://docs.enthought.com/traits/
- https://github.com/enthought/traits
- https://pypi.org/project/traits/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="dev-python/numpy[${PYTHON_USEDEP}]"
-
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? ( ${RDEPEND} )"
-
-python_prepare_all() {
- sed -i -e "s/'-O3'//g" setup.py || die
- distutils-r1_python_prepare_all
-}
-
-python_compile() {
- python_is_python3 || local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
- distutils-r1_python_compile
-}
-
-python_test() {
- cd "${BUILD_DIR}"/lib || die
- nosetests || die
-}
diff --git a/dev-python/traitsui/Manifest b/dev-python/traitsui/Manifest
deleted file mode 100644
index b33c2b314756..000000000000
--- a/dev-python/traitsui/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST traitsui-4.4.0.tar.gz 598148 BLAKE2B 140921e596bdf6309d33a5a7084103c706ea823fa990c9cef5fed02c6c823821cd402cd0ff32e9cae3c58134f9cebd4b20874ae1f5e41ba3ce469a2bbcef71e6 SHA512 bd563330aa80acbf4087b54f42ffb94856495cf82da8b9c5ae54bdcda2d2544e4293a427ed3b28de7622c2fe063cd14f969b894735eb81cb4932cc3e2ad27bef
-DIST traitsui-4.5.1.tar.gz 6692940 BLAKE2B 73900ce4012b8c60dcd4024e3010ed3a8af558b35b2b792460d43a9131b33113beb5f06169645af5743a8f3778846d916e9588159f5d04e5b8b80d5220015630 SHA512 b329d79515752e74834ac31c10d20fb75286c8b1ceab4ec7e8cdb76db586d796dcd5aa038318915e828d6ac86428b60d1e21e94c37edc45e7cb4950305252291
diff --git a/dev-python/traitsui/metadata.xml b/dev-python/traitsui/metadata.xml
deleted file mode 100644
index cfd0ec9bb672..000000000000
--- a/dev-python/traitsui/metadata.xml
+++ /dev/null
@@ -1,16 +0,0 @@
-
-
-
-
-
- The traitsui project contains a toolkit-independent GUI abstraction
- layer, which is used to support the "visualization" features of the
- Traits package. Thus, you can write code in terms of the Traits API
- (views, items, editors, etc.), and let traitsui and your selected
- toolkit and back-end take care of the details of displaying them.
-
-
- traitsui
- enthought/traitsui
-
-
diff --git a/dev-python/traitsui/traitsui-4.4.0.ebuild b/dev-python/traitsui/traitsui-4.4.0.ebuild
deleted file mode 100644
index ed0c8e23f727..000000000000
--- a/dev-python/traitsui/traitsui-4.4.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Traits-capable user interfaces"
-HOMEPAGE="https://github.com/enthought/traitsui"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- dev-python/pyface[${PYTHON_USEDEP}]
- dev-python/traits[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-python_test() {
- export ETS_TOOLKIT=qt4
- export QT_API=pyqt
- VIRTUALX_COMMAND="nosetests -v" virtualmake
-
-}
diff --git a/dev-python/traitsui/traitsui-4.5.1.ebuild b/dev-python/traitsui/traitsui-4.5.1.ebuild
deleted file mode 100644
index 41b4a0e5c918..000000000000
--- a/dev-python/traitsui/traitsui-4.5.1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Traits-capable user interfaces"
-HOMEPAGE="https://github.com/enthought/traitsui"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-RDEPEND="
- dev-python/pyface[${PYTHON_USEDEP}]
- dev-python/traits[${PYTHON_USEDEP}]"
-DEPEND="
- dev-python/setuptools[${PYTHON_USEDEP}]
- test? (
- ${RDEPEND}
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-python_test() {
- export ETS_TOOLKIT=qt4
- export QT_API=pyqt
- VIRTUALX_COMMAND="nosetests -v" virtualmake
-}
-
-python_install_all() {
- use examples && EXAMPLES=( examples )
- distutils-r1_python_install_all
-}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index ef7eb1ad0073..f3bbe70af5ca 100644
Binary files a/dev-ruby/Manifest.gz and b/dev-ruby/Manifest.gz differ
diff --git a/dev-ruby/asciidoctor-diagram/Manifest b/dev-ruby/asciidoctor-diagram/Manifest
index 408424f9d45f..64e93b21791f 100644
--- a/dev-ruby/asciidoctor-diagram/Manifest
+++ b/dev-ruby/asciidoctor-diagram/Manifest
@@ -2,3 +2,4 @@ DIST asciidoctor-diagram-1.5.12.tar.gz 11262551 BLAKE2B 08ecd3c1b7814b253e6be11d
DIST asciidoctor-diagram-1.5.13.tar.gz 11264430 BLAKE2B b5ce1946635bf24e45d8bdd264a3e924b9c876e28d42efce388e60c85e143c9267971eb2dbffe9ceb9af4770162dc1c29538291ff24b59db5fad382811810972 SHA512 9a51b69af6b60bcf7e6daa1be3965ca4497fef7e8ec04461380c51494b5c4aaba35a6e62bfe88281b8d54c8340b34b6cc739da021cfa6f7d9f528802347a02e4
DIST asciidoctor-diagram-1.5.14.tar.gz 11264778 BLAKE2B 298d3c8dc569877d4500bbbc41167de66748d67e9813c6d505aa9296fe49d973e3455a9f53a127ebc9127db64b5228c24e1ddb2ccacfe5bafdfbd5a8511ffb49 SHA512 66f8b7f48dcab4feb14eadadeb571c7cedb0b18c7a0acb004ebc6144affddc1d4a3d05a27996c666ac7966b62d05a5953b7a84895268e071445209b928fe9e89
DIST asciidoctor-diagram-1.5.15.tar.gz 11264772 BLAKE2B 7333750ac7fc5a8abdb397ed4f7a891d46a07d1032d396968e6f56abf0b50def6dfbb108f6a0a775bb9519f7b8ef91f22d70b1722496e142e8cef58315eced2c SHA512 bc3a5a53bbd53decd479a14c9ad5f561e88b5761da77f246326bd2b5b9388d3d34f18b8964fbbc0e6b47c9d212758a1983b7ed10559b5bda42d5382ded756a72
+DIST asciidoctor-diagram-1.5.16.tar.gz 11264819 BLAKE2B 31320b609aaa8458bf24d05f5ea5a561801cdf5e0243e333bbf209060fb75ebed47f94302e381420f8d294a5c0349783d8b3e2bdc81721d50d990eb978a220a5 SHA512 94822a604c43894e2be11370aa4595948e35f4f670338d84abe798beb312a8212c944e78478b785d68384177787539ed4a20a360b55325bd94ced502ca957843
diff --git a/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.16.ebuild b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.16.ebuild
new file mode 100644
index 000000000000..146e83d9a8d7
--- /dev/null
+++ b/dev-ruby/asciidoctor-diagram/asciidoctor-diagram-1.5.16.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+USE_RUBY="ruby23 ruby24 ruby25"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_RECIPE_DOC="rdoc"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.adoc LICENSE.txt README.adoc"
+
+RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
+
+inherit multilib ruby-fakegem
+
+DESCRIPTION="A set of Asciidoctor extensions that enable you to add diagrams"
+HOMEPAGE="https://github.com/asciidoctor/asciidoctor-diagram"
+SRC_URI="https://github.com/asciidoctor/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+ruby_add_rdepend "=dev-ruby/asciidoctor-1.5*
-
- #include
--#include
--#include
- #include
- #include
-
-@@ -221,14 +219,15 @@
- app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(q_argc, q_argv,
-- get_application_name(parameters, pool),
-- "subversion",
-- ki18n(get_application_name(parameters, pool)),
-- SVN_VER_NUMBER,
-- ki18n("Version control system"),
-- KCmdLineArgs::CmdLineArgKDE);
-- KComponentData component_data(KCmdLineArgs::aboutData());
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
-+
-+ /* componentName appears in KDE GUI prompts */
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
-+ i18n(get_application_name(parameters,
-+ pool)), /* displayName */
-+ QStringLiteral(SVN_VER_NUMBER));
-+ KAboutData::setApplicationData(aboutData);
-+
- QString folder = QString::fromUtf8("Subversion");
- QString key =
- QString::fromUtf8(username) + "@" + QString::fromUtf8(realmstring);
-@@ -291,14 +290,15 @@
- app = new QCoreApplication(argc, q_argv);
- }
-
-- KCmdLineArgs::init(q_argc, q_argv,
-- get_application_name(parameters, pool),
-- "subversion",
-- ki18n(get_application_name(parameters, pool)),
-- SVN_VER_NUMBER,
-- ki18n("Version control system"),
-- KCmdLineArgs::CmdLineArgKDE);
-- KComponentData component_data(KCmdLineArgs::aboutData());
-+ KLocalizedString::setApplicationDomain("subversion"); /* translation domain */
-+
-+ /* componentName appears in KDE GUI prompts */
-+ KAboutData aboutData(QStringLiteral("subversion"), /* componentName */
-+ i18n(get_application_name(parameters,
-+ pool)), /* displayName */
-+ QStringLiteral(SVN_VER_NUMBER));
-+ KAboutData::setApplicationData(aboutData);
-+
- QString q_password = QString::fromUtf8(password);
- QString folder = QString::fromUtf8("Subversion");
- KWallet::Wallet *wallet = get_wallet(wallet_name, parameters);
-unchanged:
---- a/build/ac-macros/compiler.m4 (revision 1798730)
-+++ b/build/ac-macros/compiler.m4 (revision 1798731)
-@@ -126,3 +126,18 @@
- SVN_CXXFLAGS_ADD_IFELSE([-Werror=unknown-warning-option])
- fi
- ])
-+
-+dnl The KWallet provider needs to use C++11 mode when using KDE 5
-+AC_DEFUN([SVN_CXX_MODE_SETUP11],
-+[
-+ CXXFLAGS_KEEP="$CXXFLAGS"
-+ CXXFLAGS=""
-+
-+ if test "$GXX" = "yes"; then
-+ SVN_CXXFLAGS_ADD_IFELSE([-std=c++11])
-+ fi
-+
-+ CXXMODEFLAGS="$CXXFLAGS"
-+ CXXFLAGS="$CXXFLAGS_KEEP"
-+ AC_SUBST(CXXMODEFLAGS)
-+])
-unchanged:
---- a/build/ac-macros/kwallet.m4 (revision 1798730)
-+++ b/build/ac-macros/kwallet.m4 (revision 1802646)
-@@ -25,8 +25,10 @@
- AC_DEFUN(SVN_LIB_KWALLET,
- [
- AC_ARG_WITH(kwallet,
-- [AS_HELP_STRING([[--with-kwallet[=PATH]]],
-- [Enable use of KWallet (KDE 4) for auth credentials])],
-+ [AS_HELP_STRING([[--with-kwallet[=PATH|INCDIR:LIBDIR]]],
-+ [Enable use of KWallet (KDE 5 or 4) for auth credentials.
-+ PATH is the KDE install path, alternatively INCDIR:LIBDIR
-+ are the header and library install paths. ])],
- [svn_lib_kwallet="$withval"],
- [svn_lib_kwallet=no])
-
-@@ -42,40 +44,70 @@
- if test "$APR_HAS_DSO" = "yes"; then
- if test -n "$PKG_CONFIG"; then
- if test "$HAVE_DBUS" = "yes"; then
-- AC_MSG_CHECKING([for QtCore, QtDBus, QtGui])
-- if $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-- AC_MSG_RESULT([yes])
-+ AC_MSG_CHECKING([for Qt])
-+ if $PKG_CONFIG --exists Qt5Core Qt5DBus Qt5Gui; then
-+ AC_MSG_RESULT([yes, Qt5])
-+ qt_pkg_config_names="Qt5Core Qt5DBus Qt5Gui"
-+ kde_config_name="kf5-config"
-+ kde_inc_names="KF5/KWallet KF5/KCoreAddons KF5/KI18n"
-+ kde_lib_names="-lKF5Wallet -lKF5I18n -lKF5CoreAddons -lQt5Gui -lQt5DBus -lQt5Core"
-+ elif $PKG_CONFIG --exists QtCore QtDBus QtGui; then
-+ AC_MSG_RESULT([yes, Qt4])
-+ qt_pkg_config_names="QtCore QtDBus QtGui"
-+ kde_config_name="kde4-config"
-+ kde_inc_names="/"
-+ kde_lib_names="-lkdeui -lkdecore -lQtGui -lQtDBus -lQtCore"
-+ fi
-+ if test -n "$qt_pkg_config_names"; then
- if test "$svn_lib_kwallet" != "yes"; then
-- AC_MSG_CHECKING([for kde4-config])
-- KDE4_CONFIG="$svn_lib_kwallet/bin/kde4-config"
-- if test -f "$KDE4_CONFIG" && test -x "$KDE4_CONFIG"; then
-+ AC_MSG_CHECKING([for $kde_config_name])
-+ KDE_CONFIG="$svn_lib_kwallet/bin/$kde_config_name"
-+ if test -f "$KDE_CONFIG" && test -x "$KDE_CONFIG"; then
- AC_MSG_RESULT([yes])
- else
-- KDE4_CONFIG=""
-- AC_MSG_RESULT([no])
-+ if echo "$svn_lib_kwallet" | $EGREP ":" > /dev/null; then
-+ AC_MSG_RESULT([unneeded])
-+ KDE_CONFIG="unneeded"
-+ kde_incdir=["`echo "$svn_lib_kwallet" | $SED -e "s/:.*//"`"]
-+ kde_libdir=["`echo "$svn_lib_kwallet" | $SED -e "s/.*://"`"]
-+ else
-+ AC_MSG_RESULT([no])
-+ KDE_CONFIG=""
-+ fi
- fi
- else
-- AC_PATH_PROG(KDE4_CONFIG, kde4-config)
-+ AC_PATH_PROG(KDE_CONFIG, $kde_config_name)
-+ if test -n "$KDE_CONFIG"; then
-+ kde_incdir="`$KDE_CONFIG --install include`"
-+ kde_libdir="`$KDE_CONFIG --install lib`"
-+ fi
- fi
-- if test -n "$KDE4_CONFIG"; then
-- AC_MSG_CHECKING([for KWallet])
-+ if test -n "$KDE_CONFIG"; then
-+ if test $kde_config_name = "kf5-config"; then
-+ dnl KF5 does not compile with -std=c++98
-+ SVN_CXX_MODE_SETUP11
-+ fi
- old_CXXFLAGS="$CXXFLAGS"
- old_LDFLAGS="$LDFLAGS"
- old_LIBS="$LIBS"
-- for d in [`$PKG_CONFIG --cflags QtCore QtDBus QtGui`]; do
-+ dnl --std=c++11 may be required
-+ CXXFLAGS="$CXXFLAGS $CXXMODEFLAGS"
-+ AC_MSG_CHECKING([for KWallet])
-+ for d in [`$PKG_CONFIG --cflags $qt_pkg_config_names`]; do
- if test -n ["`echo "$d" | $EGREP -- '^-D[^[:space:]]*'`"]; then
- CPPFLAGS="$CPPFLAGS $d"
- fi
- done
-- qt_include_dirs="`$PKG_CONFIG --cflags-only-I QtCore QtDBus QtGui`"
-- kde_incdir="`$KDE4_CONFIG --install include`"
-- SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs -I$kde_incdir"
-- qt_libs_other_options="`$PKG_CONFIG --libs-only-other QtCore QtDBus QtGui`"
-- SVN_KWALLET_LIBS="$DBUS_LIBS -lQtCore -lQtDBus -lQtGui -lkdecore -lkdeui $qt_libs_other_options"
-- CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES"
-+ qt_include_dirs="`$PKG_CONFIG --cflags-only-I $qt_pkg_config_names`"
-+ for kde_inc_name in $kde_inc_names; do
-+ kde_kwallet_includes="$kde_kwallet_includes -I$kde_incdir/$kde_inc_name"
-+ done
-+ SVN_KWALLET_INCLUDES="$DBUS_CPPFLAGS $qt_include_dirs $kde_kwallet_includes"
-+ qt_libs_other_options="`$PKG_CONFIG --libs-only-other $qt_pkg_config_names`"
-+ SVN_KWALLET_LIBS="$DBUS_LIBS $kde_lib_names $qt_libs_other_options"
-+ CXXFLAGS="$CXXFLAGS $SVN_KWALLET_INCLUDES -fPIC"
- LIBS="$LIBS $SVN_KWALLET_LIBS"
-- qt_lib_dirs="`$PKG_CONFIG --libs-only-L QtCore QtDBus QtGui`"
-- kde_libdir="`$KDE4_CONFIG --install lib`"
-+ qt_lib_dirs="`$PKG_CONFIG --libs-only-L $qt_pkg_config_names`"
- LDFLAGS="$old_LDFLAGS `SVN_REMOVE_STANDARD_LIB_DIRS($qt_lib_dirs -L$kde_libdir)`"
- AC_LANG(C++)
- AC_LINK_IFELSE([AC_LANG_SOURCE([[
-@@ -87,16 +119,19 @@
- AC_MSG_RESULT([yes])
- CXXFLAGS="$old_CXXFLAGS"
- LIBS="$old_LIBS"
-+ if test "$kde_config_name" = "kf5-config"; then
-+ AC_DEFINE([SVN_HAVE_KF5], [1], [Defined if KF5 available])
-+ fi
- else
- AC_MSG_RESULT([no])
- AC_MSG_ERROR([cannot find KWallet])
- fi
- else
-- AC_MSG_ERROR([cannot find kde4-config])
-+ AC_MSG_ERROR([cannot find $kde_config_name])
- fi
- else
- AC_MSG_RESULT([no])
-- AC_MSG_ERROR([cannot find QtCore, QtDBus, QtGui])
-+ AC_MSG_ERROR([cannot find Qt])
- fi
- else
- AC_MSG_ERROR([cannot find D-Bus])
diff --git a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild
index 2f0f32c6f26e..df6ddf73f8a5 100644
--- a/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild
+++ b/dev-vcs/subversion/subversion-1.12.0_rc1.ebuild
@@ -4,7 +4,7 @@
EAPI=6
PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby26 ruby25 ruby24 ruby23"
+USE_RUBY="ruby26 ruby25 ruby24"
DISTUTILS_OPTIONAL=1
WANT_AUTOMAKE="none"
GENTOO_DEPEND_ON_PERL="no"
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
LICENSE="Subversion GPL-2"
SLOT="0"
[[ "${PV}" = *_rc* ]] || \
-KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
COMMON_DEPEND="
diff --git a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild b/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
deleted file mode 100644
index 6be305333dd6..000000000000
--- a/dev-vcs/subversion/subversion-1.9.7-r1.ebuild
+++ /dev/null
@@ -1,531 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-USE_RUBY="ruby23 ruby22 ruby21"
-DISTUTILS_OPTIONAL=1
-WANT_AUTOMAKE="none"
-GENTOO_DEPEND_ON_PERL="no"
-
-inherit autotools bash-completion-r1 db-use depend.apache distutils-r1 elisp-common eutils flag-o-matic java-pkg-opt-2 libtool multilib perl-module ruby-single xdg-utils
-
-MY_P="${P/_/-}"
-DESCRIPTION="Advanced version control system"
-HOMEPAGE="https://subversion.apache.org/"
-SRC_URI="mirror://apache/${PN}/${MY_P}.tar.bz2
- https://dev.gentoo.org/~mgorny/dist/${PN}-1.8.18-patchset.tar.bz2"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Subversion GPL-2"
-SLOT="0"
-KEYWORDS="~arm64 ~mips s390 ~sh ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax"
-
-COMMON_DEPEND="
- app-arch/bzip2
- >=dev-db/sqlite-3.7.12
- >=dev-libs/apr-1.3:1
- >=dev-libs/apr-util-1.3:1
- dev-libs/expat
- sys-apps/file
- sys-libs/zlib
- berkdb? ( >=sys-libs/db-4.0.14:= )
- ctypes-python? ( ${PYTHON_DEPS} )
- gnome-keyring? (
- dev-libs/glib:2
- gnome-base/libgnome-keyring
- sys-apps/dbus
- )
- http? ( >=net-libs/serf-1.3.4 )
- kwallet? (
- dev-qt/qtcore:5
- dev-qt/qtdbus:5
- dev-qt/qtgui:5
- kde-frameworks/kcoreaddons:5
- kde-frameworks/ki18n:5
- kde-frameworks/kwallet:5
- sys-apps/dbus
- )
- perl? ( dev-lang/perl:= )
- python? ( ${PYTHON_DEPS} )
- ruby? ( ${RUBY_DEPS} )
- sasl? ( dev-libs/cyrus-sasl )"
-RDEPEND="${COMMON_DEPEND}
- apache2? ( www-servers/apache[apache2_modules_dav] )
- java? ( >=virtual/jre-1.5 )
- nls? ( virtual/libintl )
- perl? ( dev-perl/URI )"
-# Note: ctypesgen doesn't need PYTHON_USEDEP, it's used once
-DEPEND="${COMMON_DEPEND}
- !!=virtual/jdk-1.5 )
- kwallet? (
- kde-frameworks/kdelibs4support:5
- virtual/pkgconfig
- )
- nls? ( sys-devel/gettext )
- test? ( ${PYTHON_DEPS} )"
-
-REQUIRED_USE="
- ctypes-python? ( ${PYTHON_REQUIRED_USE} )
- python? ( ${PYTHON_REQUIRED_USE} )
- test? (
- ${PYTHON_REQUIRED_USE}
- !dso
- )"
-
-PATCHES=(
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.4-interix.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.5.6-aix-dso.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.0-hpux-dso.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-fix-parallel-build-support-for-perl-bindings.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.1-revert_bdb6check.patch
- "${WORKDIR}"/${PN}-1.8.18-patchset/${PN}-1.8.16-javadoc-nolint.patch
- "${FILESDIR}"/${P}-kf5.patch
- "${FILESDIR}"/${PN}-1.9.7-fix-wc-queries-test-test.patch
- "${FILESDIR}"/${PN}-1.11.1-allow-apr-1.7.0+.patch
-)
-
-want_apache
-
-pkg_setup() {
- if use berkdb ; then
- local apu_bdb_version="$(${EPREFIX}/usr/bin/apu-1-config --includes \
- | grep -Eoe '-I${EPREFIX}/usr/include/db[[:digit:]]\.[[:digit:]]' \
- | sed 's:.*b::')"
- einfo
- if [[ -z "${SVN_BDB_VERSION}" ]] ; then
- if [[ -n "${apu_bdb_version}" ]] ; then
- SVN_BDB_VERSION="${apu_bdb_version}"
- einfo "Matching db version to apr-util"
- else
- SVN_BDB_VERSION="$(db_ver_to_slot "$(db_findver sys-libs/db 2>/dev/null)")"
- einfo "SVN_BDB_VERSION variable isn't set. You can set it to enforce using of specific version of Berkeley DB."
- fi
- fi
- einfo "Using: Berkeley DB ${SVN_BDB_VERSION}"
- einfo
-
- if [[ -n "${apu_bdb_version}" && "${SVN_BDB_VERSION}" != "${apu_bdb_version}" ]]; then
- eerror "APR-Util is linked against Berkeley DB ${apu_bdb_version}, but you are trying"
- eerror "to build Subversion with support for Berkeley DB ${SVN_BDB_VERSION}."
- eerror "Rebuild dev-libs/apr-util or set SVN_BDB_VERSION=\"${apu_bdb_version}\"."
- eerror "Aborting to avoid possible run-time crashes."
- die "Berkeley DB version mismatch"
- fi
- fi
-
- depend.apache_pkg_setup
-
- java-pkg-opt-2_pkg_setup
-
- if ! use http ; then
- ewarn "WebDAV support is disabled. You need WebDAV to"
- ewarn "access repositories through the HTTP protocol."
- ewarn "Consider enabling \"http\" USE flag"
- echo -ne "\a"
- fi
-
- # https://issues.apache.org/jira/browse/SVN-4813#comment-16813739
- append-cppflags -P
-
- if use debug ; then
- append-cppflags -DSVN_DEBUG -DAP_DEBUG
- fi
-
- # http://mail-archives.apache.org/mod_mbox/subversion-dev/201306.mbox/%3C51C42014.3060700@wandisco.com%3E
- [[ ${CHOST} == *-solaris2* ]] && append-cppflags -D__EXTENSIONS__
-
- # Allow for custom repository locations.
- SVN_REPOS_LOC="${SVN_REPOS_LOC:-${EPREFIX}/var/svn}"
-
- if use ruby ; then
- local rbslot
- RB_VER=""
- for rbslot in $(sed 's@\([[:digit:]]\+\)\([[:digit:]]\)@\1.\2@g' <<< ${USE_RUBY//ruby}) ; do
- if has_version dev-lang/ruby:${rbslot} ; then
- RB_VER="${rbslot/.}"
- break
- fi
- done
- [[ -z "${RB_VER}" ]] && die "No useable ruby version found"
- fi
-}
-
-src_prepare() {
- default
-
- fperms +x build/transform_libtool_scripts.sh
-
- sed -i \
- -e "s/\(BUILD_RULES=.*\) bdb-test\(.*\)/\1\2/g" \
- -e "s/\(BUILD_RULES=.*\) test\(.*\)/\1\2/g" configure.ac
-
- # this bites us in particular on Solaris
- sed -i -e '1c\#!/usr/bin/env sh' build/transform_libtool_scripts.sh || \
- die "/bin/sh is not POSIX shell!"
-
- eautoconf
- elibtoolize
-
- sed -e 's/\(libsvn_swig_py\)-\(1\.la\)/\1-$(EPYTHON)-\2/g' \
- -i build-outputs.mk || die "sed failed"
-
- if use python ; then
- # XXX: make python_copy_sources accept path
- S=${S}/subversion/bindings/swig/python python_copy_sources
- rm -r "${S}"/subversion/bindings/swig/python || die
- fi
-
- xdg_environment_reset
-}
-
-src_configure() {
- local myconf=(
- --libdir="${EPREFIX%/}/usr/$(get_libdir)"
- $(use_with apache2 apache-libexecdir)
- $(use_with apache2 apxs "${APXS}")
- $(use_with berkdb berkeley-db "db.h:${EPREFIX%/}/usr/include/db${SVN_BDB_VERSION}::db-${SVN_BDB_VERSION}")
- $(use_with ctypes-python ctypesgen "${EPREFIX%/}/usr")
- $(use_enable dso runtime-module-search)
- $(use_with gnome-keyring)
- $(use_enable java javahl)
- $(use_with java jdk "${JAVA_HOME}")
- $(use_with kwallet)
- $(use_enable nls)
- $(use_with sasl)
- $(use_with http serf)
- --with-apr="${EPREFIX%/}/usr/bin/apr-1-config"
- --with-apr-util="${EPREFIX%/}/usr/bin/apu-1-config"
- --disable-experimental-libtool
- --without-jikes
- --disable-mod-activation
- --disable-static
- )
-
- if use python || use perl || use ruby; then
- myconf+=( --with-swig )
- else
- myconf+=( --without-swig )
- fi
-
- if use java ; then
- myconf+=( --without-junit )
- fi
-
- case ${CHOST} in
- *-aix*)
- # avoid recording immediate path to sharedlibs into executables
- append-ldflags -Wl,-bnoipath
- ;;
- *-cygwin*)
- # no LD_PRELOAD support, no undefined symbols
- myconf+=( --disable-local-library-preloading LT_LDFLAGS=-no-undefined )
- ;;
- *-interix*)
- # loader crashes on the LD_PRELOADs...
- myconf+=( --disable-local-library-preloading )
- ;;
- *-solaris*)
- # need -lintl to link
- use nls && append-libs intl
- # this breaks installation, on x64 echo replacement is 32-bits
- myconf+=( --disable-local-library-preloading )
- ;;
- *-mint*)
- myconf+=( --enable-all-static --disable-local-library-preloading )
- ;;
- *)
- # inject LD_PRELOAD entries for easy in-tree development
- myconf+=( --enable-local-library-preloading )
- ;;
- esac
-
- #version 1.7.7 again tries to link against the older installed version and fails, when trying to
- #compile for x86 on amd64, so workaround this issue again
- #check newer versions, if this is still/again needed
- myconf+=( --disable-disallowing-of-undefined-references )
-
- # for build-time scripts
- if use ctypes-python || use python || use test; then
- python_setup
- fi
-
- if use python && [[ ${CHOST} == *-darwin* ]] ; then
- export ac_cv_python_link="$(tc-getCC) "'$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_libs='$(PYTHON_CFLAGS) -bundle -undefined dynamic_lookup $(PYTHON_LIBS)'
- export ac_cv_python_compile="$(tc-getCC)"
- fi
-
- # allow overriding Python include directory
- ac_cv_path_RUBY=$(usex ruby "${EPREFIX%/}/usr/bin/ruby${RB_VER}" "none") \
- ac_cv_path_RDOC=$(usex ruby "${EPREFIX%/}/usr/bin/rdoc${RB_VER}" "none") \
- ac_cv_python_includes='-I$(PYTHON_INCLUDEDIR)' \
- econf "${myconf[@]}"
-}
-
-src_compile() {
- emake local-all
-
- if use ctypes-python ; then
- # pre-generate .py files
- use ctypes-python && emake ctypes-python
-
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_compile
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_compile() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- python_export PYTHON_INCLUDEDIR
- emake swig-py \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn"
- }
-
- # this will give us proper BUILD_DIR for symlinking
- BUILD_DIR=python \
- python_foreach_impl swig_py_compile
- fi
-
- if use perl ; then
- emake swig-pl
- fi
-
- if use ruby ; then
- emake swig-rb
- fi
-
- if use java ; then
- emake -j1 JAVAC_FLAGS="$(java-pkg_javac-args) -encoding iso8859-1" javahl
- fi
-
- if use extras ; then
- emake tools
- fi
-
- if use doc ; then
- doxygen doc/doxygen.conf || die "Building of Subversion HTML documentation failed"
-
- if use java; then
- emake doc-javahl
- fi
- fi
-}
-
-src_test() {
- if has_version ~${CATEGORY}/${P} ; then
- default
-
- if use ctypes-python ; then
- python_test() {
- "${PYTHON}" subversion/bindings/ctypes-python/test/run_all.py \
- || die "ctypes-python tests fail with ${EPYTHON}"
- }
-
- distutils-r1_src_test
- fi
-
- if use python ; then
- swig_py_test() {
- pushd "${BUILD_DIR}" >/dev/null || die
- "${PYTHON}" tests/run_all.py || die "swig-py tests fail with ${EPYTHON}"
- popd >/dev/null || die
- }
-
- BUILD_DIR=subversion/bindings/swig/python \
- python_foreach_impl swig_py_test
- fi
- else
- ewarn "The test suite shows errors when there is an older version of"
- ewarn "${CATEGORY}/${PN} installed. Please install =${CATEGORY}/${P}*"
- ewarn "before running the test suite."
- ewarn "Test suite skipped."
- fi
-}
-
-src_install() {
- emake -j1 DESTDIR="${D}" local-install
-
- if use ctypes-python ; then
- pushd subversion/bindings/ctypes-python >/dev/null || die
- distutils-r1_src_install
- popd >/dev/null || die
- fi
-
- if use python ; then
- swig_py_install() {
- local p=subversion/bindings/swig/python
- rm -f ${p} || die
- ln -s "${BUILD_DIR}" ${p} || die
-
- emake \
- DESTDIR="${D}" \
- swig_pydir="$(python_get_sitedir)/libsvn" \
- swig_pydir_extra="$(python_get_sitedir)/svn" \
- install-swig-py
- }
-
- BUILD_DIR=python \
- python_foreach_impl swig_py_install
- fi
-
- if use perl ; then
- emake DESTDIR="${D}" INSTALLDIRS="vendor" install-swig-pl
- perl_delete_localpod
- find "${ED}" "(" -name .packlist -o -name "*.bs" ")" -delete
- fi
-
- if use ruby ; then
- emake DESTDIR="${D}" install-swig-rb
- fi
-
- if use java ; then
- emake DESTDIR="${D}" install-javahl
- java-pkg_regso "${ED%/}"/usr/$(get_libdir)/libsvnjavahl*$(get_libname)
- java-pkg_dojar "${ED%/}"/usr/$(get_libdir)/svn-javahl/svn-javahl.jar
- rm -fr "${ED%/}"/usr/$(get_libdir)/svn-javahl/*.jar
- fi
-
- # Install Apache module configuration.
- if use apache2 ; then
- keepdir "${APACHE_MODULES_CONFDIR}"
- insinto "${APACHE_MODULES_CONFDIR}"
- doins "${FILESDIR}/47_mod_dav_svn.conf"
- fi
-
- # Install Bash Completion, bug 43179.
- newbashcomp tools/client-side/bash_completion svn
- bashcomp_alias svn svn{admin,dumpfilter,look,sync,version}
- rm -f tools/client-side/bash_completion
-
- # Install hot backup script, bug 54304.
- newbin tools/backup/hot-backup.py svn-hot-backup
- rm -fr tools/backup
-
- # Install svnserve init-script and xinet.d snippet, bug 43245.
- newinitd "${FILESDIR}"/svnserve.initd3 svnserve
- newconfd "${FILESDIR}"/svnserve.confd svnserve
- insinto /etc/xinetd.d
- newins "${FILESDIR}"/svnserve.xinetd svnserve
-
- #adjust default user and group with disabled apache2 USE flag, bug 381385
- use apache2 || sed -e "s\USER:-apache\USER:-svn\g" \
- -e "s\GROUP:-apache\GROUP:-svnusers\g" \
- -i "${ED%/}"/etc/init.d/svnserve || die
- use apache2 || sed -e "0,/apache/s//svn/" \
- -e "s:apache:svnusers:" \
- -i "${ED%/}"/etc/xinetd.d/svnserve || die
-
- # Install documentation.
- dodoc CHANGES COMMITTERS README
- dodoc tools/xslt/svnindex.{css,xsl}
- rm -fr tools/xslt
-
- # Install extra files.
- if use extras ; then
- cat <<- EOF > 80subversion-extras
- PATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
- ROOTPATH="${EPREFIX}/usr/$(get_libdir)/subversion/bin"
- EOF
- doenvd 80subversion-extras
-
- emake DESTDIR="${D}" toolsdir="/usr/$(get_libdir)/subversion/bin" install-tools
-
- find tools "(" -name "*.bat" -o -name "*.in" -o -name ".libs" ")" -print0 | xargs -0 rm -fr
- rm -fr tools/client-side/svnmucc
- rm -fr tools/server-side/{svn-populate-node-origins-index,svnauthz-validate}*
- rm -fr tools/{buildbot,dev,diff,po}
-
- insinto /usr/share/${PN}
- find tools -name '*.py' -exec sed -i -e '1s:python:&2:' {} + || die
- doins -r tools
- fi
-
- if use doc ; then
- docinto html
- dodoc -r doc/doxygen/html/*
-
- if use java ; then
- java-pkg_dojavadoc doc/javadoc
- fi
- fi
-
- prune_libtool_files --all
-
- cd "${ED%/}"/usr/share/locale
- for i in * ; do
- [[ ${i} == *$LINGUAS* ]] || { rm -r ${i} || die ; }
- done
-}
-
-pkg_preinst() {
- # Compare versions of Berkeley DB, bug 122877.
- if use berkdb && [[ -f "${EROOT%/}/usr/bin/svn" ]] ; then
- OLD_BDB_VERSION="$(scanelf -nq "${EROOT%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- NEW_BDB_VERSION="$(scanelf -nq "${ED%/}/usr/$(get_libdir)/libsvn_subr-1$(get_libname 0)" | grep -Eo "libdb-[[:digit:]]+\.[[:digit:]]+" | sed -e "s/libdb-\(.*\)/\1/")"
- if [[ "${OLD_BDB_VERSION}" != "${NEW_BDB_VERSION}" ]] ; then
- CHANGED_BDB_VERSION="1"
- fi
- fi
-}
-
-pkg_postinst() {
- if [[ -n "${CHANGED_BDB_VERSION}" ]] ; then
- ewarn "You upgraded from an older version of Berkeley DB and may experience"
- ewarn "problems with your repository. Run the following commands as root to fix it:"
- ewarn " db4_recover -h ${SVN_REPOS_LOC}/repos"
- ewarn " chown -Rf apache:apache ${SVN_REPOS_LOC}/repos"
- fi
-
- ewarn "If you run subversion as a daemon, you will need to restart it to avoid module mismatches."
-}
-
-pkg_postrm() {
- :
-}
-
-pkg_config() {
- # Remember: Don't use ${EROOT}${SVN_REPOS_LOC} since ${SVN_REPOS_LOC}
- # already has EPREFIX in it
- einfo "Initializing the database in ${SVN_REPOS_LOC}..."
- if [[ -e "${SVN_REPOS_LOC}/repos" ]] ; then
- echo "A Subversion repository already exists and I will not overwrite it."
- echo "Delete \"${SVN_REPOS_LOC}/repos\" first if you're sure you want to have a clean version."
- else
- mkdir -p "${SVN_REPOS_LOC}/conf"
-
- einfo "Populating repository directory..."
- # Create initial repository.
- "${EROOT}usr/bin/svnadmin" create "${SVN_REPOS_LOC}/repos"
-
- einfo "Setting repository permissions..."
- SVNSERVE_USER="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_USER}")"
- SVNSERVE_GROUP="$(. "${EROOT}etc/conf.d/svnserve"; echo "${SVNSERVE_GROUP}")"
- if use apache2 ; then
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="apache"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="apache"
- else
- [[ -z "${SVNSERVE_USER}" ]] && SVNSERVE_USER="svn"
- [[ -z "${SVNSERVE_GROUP}" ]] && SVNSERVE_GROUP="svnusers"
- fi
- chmod -Rf go-rwx "${SVN_REPOS_LOC}/conf"
- chmod -Rf o-rwx "${SVN_REPOS_LOC}/repos"
- echo "Please create \"${SVNSERVE_GROUP}\" group if it does not exist yet."
- echo "Afterwards please create \"${SVNSERVE_USER}\" user with homedir \"${SVN_REPOS_LOC}\""
- echo "and as part of the \"${SVNSERVE_GROUP}\" group if it does not exist yet."
- echo "Finally, execute \"chown -Rf ${SVNSERVE_USER}:${SVNSERVE_GROUP} ${SVN_REPOS_LOC}/repos\""
- echo "to finish the configuration."
- fi
-}
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 7fa0bd6f4ebd..03b8858dae14 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild b/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
index 87491afe0f23..c3da891efd81 100644
--- a/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
+++ b/games-arcade/batrachians/batrachians-0.1.6-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -7,8 +7,8 @@ GNOME2_EAUTORECONF="yes"
inherit autotools gnome2
DESCRIPTION="A fly-eating frog video game"
-HOMEPAGE="http://perso.b2b2c.ca/sarrazip/dev/batrachians.html"
-SRC_URI="http://perso.b2b2c.ca/sarrazip/dev/${P}.tar.gz"
+HOMEPAGE="https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html"
+SRC_URI="https://perso.b2b2c.ca/~sarrazip/dev/${P}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
diff --git a/licenses/Manifest.gz b/licenses/Manifest.gz
index 8ec8177efa9d..fbadb607d0da 100644
Binary files a/licenses/Manifest.gz and b/licenses/Manifest.gz differ
diff --git a/licenses/StarUML-EULA b/licenses/StarUML-EULA
deleted file mode 100644
index 52087572c55f..000000000000
--- a/licenses/StarUML-EULA
+++ /dev/null
@@ -1,26 +0,0 @@
-End User License Agreement
-The SOFTWARE PRODUCT (StarUML) is protected by copyright laws and international copyright treaties, as well as other intellectual property laws and treaties. The SOFTWARE PRODUCT is licensed, not sold.
-LICENSES
-StarUML is licensed as follows:
-Installation and Usage.
-
-Licenses are per user and valid for use on all supported operating systems. License keys may be used on multiple computers and operating systems, provided the license key holder is the primary user. Businesses must purchase at least as many licenses as the number of people using StarUML.
-Backup Copies.
-
-You may make copies of the license key and or StarUML for backup and archival purposes.
-DESCRIPTION OF OTHER RIGHTS AND LIMITATIONS
-Maintenance of Copyright Notices.
-
-You must not remove or alter any copyright notices on any copy of StarUML.
-Distribution.
-
-You may not distribute or sell license keys or StarUML to third parties. Licenses will be revoked if distributed or sold to third parties.
-Rental.
-
-You may not rent, lease, or lend the license key or StarUML.
-COPYRIGHT
-All title, including but not limited to copyrights, in and to StarUML and any copies thereof are owned by MKLab.
-NO WARRANTIES
-MKLab expressly disclaims any warranty for StarUML, which is provided 'as is' without any express or implied warranty of any kind, including but not limited to any warranties of merchantability, non-infringement, or fitness of a particular purpose.
-LIMITATION OF LIABILITY
-In no event shall MKLab be liable for any damages due to use of StarUML, to the maximum extent permitted by law. This includes without limitation, lost profits, business interruption, or lost information. In no event will MKLab be liable for loss of data or for indirect, special, incidental, consequential (including lost profit), or other damages. MKLab shall have no liability with respect to the content of StarUML or any part thereof, including but not limited to errors or omissions contained therein, libel, trademark rights, business interruption, loss of privacy or the disclosure of confidential information.
diff --git a/licenses/libpng b/licenses/libpng
index fd4de3d5eabd..6ee9c8f55482 100644
--- a/licenses/libpng
+++ b/licenses/libpng
@@ -1,3 +1,8 @@
+
+This copy of the libpng notices is provided for your convenience. In case of
+any discrepancy between this copy and the notices in the file png.h that is
+included in the libpng distribution, the latter shall prevail.
+
COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
If you modify libpng you may insert additional notices immediately following
@@ -5,21 +10,21 @@ this sentence.
This code is released under the libpng license.
-libpng versions 1.2.6, August 15, 2004, through 1.5.12, July 11, 2012, are
-Copyright (c) 2004, 2006-2012 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.2.5
-with the following individual added to the list of Contributing Authors:
-
- Cosmin Truta
-
-libpng versions 1.0.7, July 1, 2000, through 1.2.5, October 3, 2002, are
-Copyright (c) 2000-2002 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-1.0.6
-with the following individuals added to the list of Contributing Authors:
+libpng versions 1.0.7, July 1, 2000 through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
Simon-Pierre Cadieux
Eric S. Raymond
+ Mans Rullgard
+ Cosmin Truta
Gilles Vollant
+ James Yu
+ Mandar Sahastrabuddhe
+ Google Inc.
+ Vadim Barkov
and with the following additions to the disclaimer:
@@ -30,19 +35,25 @@ and with the following additions to the disclaimer:
risk of satisfactory quality, performance, accuracy, and effort is with
the user.
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners and
+are released under other open source licenses.
+
libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
-Copyright (c) 1998, 1999, 2000 Glenn Randers-Pehrson, and are
-distributed according to the same disclaimer and license as libpng-0.96,
-with the following individuals added to the list of Contributing Authors:
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the list
+of Contributing Authors:
Tom Lane
Glenn Randers-Pehrson
Willem van Schaik
libpng versions 0.89, June 1996, through 0.96, May 1997, are
-Copyright (c) 1996, 1997 Andreas Dilger
-Distributed according to the same disclaimer and license as libpng-0.88,
-with the following individuals added to the list of Contributing Authors:
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
John Bowler
Kevin Bracey
@@ -51,8 +62,11 @@ with the following individuals added to the list of Contributing Authors:
Greg Roelofs
Tom Tanner
+Some files in the "scripts" directory have other copyright owners
+but are released under this license.
+
libpng versions 0.5, May 1995, through 0.88, January 1996, are
-Copyright (c) 1995, 1996 Guy Eric Schalnat, Group 42, Inc.
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
For the purposes of this copyright and license, "Contributing Authors"
is defined as the following set of individuals:
@@ -80,11 +94,40 @@ to the following restrictions:
2. Altered versions must be plainly marked as such and must not
be misrepresented as being the original source.
- 3. This Copyright notice may not be removed or altered from
- any source or altered source distribution.
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
The Contributing Authors and Group 42, Inc. specifically permit, without
fee, and encourage the use of this source code as a component to
supporting the PNG file format in commercial products. If you use this
source code in a product, acknowledgment is not required but would be
appreciated.
+
+END OF COPYRIGHT NOTICE, DISCLAIMER, and LICENSE.
+
+TRADEMARK:
+
+The name "libpng" has not been registered by the Copyright owner
+as a trademark in any jurisdiction. However, because libpng has
+been distributed and maintained world-wide, continually since 1995,
+the Copyright owner claims "common-law trademark protection" in any
+jurisdiction where common-law trademark is recognized.
+
+OSI CERTIFICATION:
+
+Libpng is OSI Certified Open Source Software. OSI Certified Open Source is
+a certification mark of the Open Source Initiative. OSI has not addressed
+the additional disclaimers inserted at version 1.0.7.
+
+EXPORT CONTROL:
+
+The Copyright owner believes that the Export Control Classification
+Number (ECCN) for libpng is EAR99, which means not subject to export
+controls or International Traffic in Arms Regulations (ITAR) because
+it is open source, publicly available software, that does not contain
+any encryption software. See the EAR, paragraphs 734.3(b)(3) and
+734.7(b).
+
+Glenn Randers-Pehrson
+glennrp at users.sourceforge.net
+July 15, 2018
diff --git a/licenses/libpng2 b/licenses/libpng2
new file mode 100644
index 000000000000..e0c5b531cf54
--- /dev/null
+++ b/licenses/libpng2
@@ -0,0 +1,134 @@
+COPYRIGHT NOTICE, DISCLAIMER, and LICENSE
+=========================================
+
+PNG Reference Library License version 2
+---------------------------------------
+
+ * Copyright (c) 1995-2019 The PNG Reference Library Authors.
+ * Copyright (c) 2018-2019 Cosmin Truta.
+ * Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson.
+ * Copyright (c) 1996-1997 Andreas Dilger.
+ * Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+The software is supplied "as is", without warranty of any kind,
+express or implied, including, without limitation, the warranties
+of merchantability, fitness for a particular purpose, title, and
+non-infringement. In no event shall the Copyright owners, or
+anyone distributing the software, be liable for any damages or
+other liability, whether in contract, tort or otherwise, arising
+from, out of, or in connection with the software, or the use or
+other dealings in the software, even if advised of the possibility
+of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute
+this software, or portions hereof, for any purpose, without fee,
+subject to the following restrictions:
+
+ 1. The origin of this software must not be misrepresented; you
+ must not claim that you wrote the original software. If you
+ use this software in a product, an acknowledgment in the product
+ documentation would be appreciated, but is not required.
+
+ 2. Altered source versions must be plainly marked as such, and must
+ not be misrepresented as being the original software.
+
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
+
+
+PNG Reference Library License version 1 (for libpng 0.5 through 1.6.35)
+-----------------------------------------------------------------------
+
+libpng versions 1.0.7, July 1, 2000, through 1.6.35, July 15, 2018 are
+Copyright (c) 2000-2002, 2004, 2006-2018 Glenn Randers-Pehrson, are
+derived from libpng-1.0.6, and are distributed according to the same
+disclaimer and license as libpng-1.0.6 with the following individuals
+added to the list of Contributing Authors:
+
+ Simon-Pierre Cadieux
+ Eric S. Raymond
+ Mans Rullgard
+ Cosmin Truta
+ Gilles Vollant
+ James Yu
+ Mandar Sahastrabuddhe
+ Google Inc.
+ Vadim Barkov
+
+and with the following additions to the disclaimer:
+
+ There is no warranty against interference with your enjoyment of
+ the library or against infringement. There is no warranty that our
+ efforts or the library will fulfill any of your particular purposes
+ or needs. This library is provided with all faults, and the entire
+ risk of satisfactory quality, performance, accuracy, and effort is
+ with the user.
+
+Some files in the "contrib" directory and some configure-generated
+files that are distributed with libpng have other copyright owners, and
+are released under other open source licenses.
+
+libpng versions 0.97, January 1998, through 1.0.6, March 20, 2000, are
+Copyright (c) 1998-2000 Glenn Randers-Pehrson, are derived from
+libpng-0.96, and are distributed according to the same disclaimer and
+license as libpng-0.96, with the following individuals added to the
+list of Contributing Authors:
+
+ Tom Lane
+ Glenn Randers-Pehrson
+ Willem van Schaik
+
+libpng versions 0.89, June 1996, through 0.96, May 1997, are
+Copyright (c) 1996-1997 Andreas Dilger, are derived from libpng-0.88,
+and are distributed according to the same disclaimer and license as
+libpng-0.88, with the following individuals added to the list of
+Contributing Authors:
+
+ John Bowler
+ Kevin Bracey
+ Sam Bushell
+ Magnus Holmgren
+ Greg Roelofs
+ Tom Tanner
+
+Some files in the "scripts" directory have other copyright owners,
+but are released under this license.
+
+libpng versions 0.5, May 1995, through 0.88, January 1996, are
+Copyright (c) 1995-1996 Guy Eric Schalnat, Group 42, Inc.
+
+For the purposes of this copyright and license, "Contributing Authors"
+is defined as the following set of individuals:
+
+ Andreas Dilger
+ Dave Martindale
+ Guy Eric Schalnat
+ Paul Schmidt
+ Tim Wegner
+
+The PNG Reference Library is supplied "AS IS". The Contributing
+Authors and Group 42, Inc. disclaim all warranties, expressed or
+implied, including, without limitation, the warranties of
+merchantability and of fitness for any purpose. The Contributing
+Authors and Group 42, Inc. assume no liability for direct, indirect,
+incidental, special, exemplary, or consequential damages, which may
+result from the use of the PNG Reference Library, even if advised of
+the possibility of such damage.
+
+Permission is hereby granted to use, copy, modify, and distribute this
+source code, or portions hereof, for any purpose, without fee, subject
+to the following restrictions:
+
+ 1. The origin of this source code must not be misrepresented.
+
+ 2. Altered versions must be plainly marked as such and must not
+ be misrepresented as being the original source.
+
+ 3. This Copyright notice may not be removed or altered from any
+ source or altered source distribution.
+
+The Contributing Authors and Group 42, Inc. specifically permit,
+without fee, and encourage the use of this source code as a component
+to supporting the PNG file format in commercial products. If you use
+this source code in a product, acknowledgment is not required but would
+be appreciated.
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 5514700d29d4..8046b6519eb5 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libpng/libpng-1.6.36.ebuild b/media-libs/libpng/libpng-1.6.36.ebuild
index 1bce3c6cb23b..30db848bda4c 100644
--- a/media-libs/libpng/libpng-1.6.36.ebuild
+++ b/media-libs/libpng/libpng-1.6.36.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -10,7 +10,7 @@ HOMEPAGE="http://www.libpng.org/"
SRC_URI="mirror://sourceforge/${PN}/${P}.tar.xz
apng? ( mirror://sourceforge/apng/${P}-apng.patch.gz )"
-LICENSE="libpng"
+LICENSE="libpng2"
SLOT="0/16"
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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
IUSE="apng cpu_flags_x86_sse neon static-libs"
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 72eb29849d21..3b010556495f 100644
Binary files a/metadata/Manifest.gz and b/metadata/Manifest.gz differ
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index 8ffc9cfb0c24..b263d18bc1bb 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Apr 2019 04:38:43 +0000
+Mon, 15 Apr 2019 08:38:46 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 8ffc9cfb0c24..b263d18bc1bb 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Apr 2019 04:38:43 +0000
+Mon, 15 Apr 2019 08:38:46 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index eb85fae6b421..265428e9e7e7 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index a576f593ec67..894e3ae868fb 100644
Binary files a/metadata/md5-cache/app-arch/Manifest.gz and b/metadata/md5-cache/app-arch/Manifest.gz differ
diff --git a/metadata/md5-cache/app-arch/atool-0.39.0 b/metadata/md5-cache/app-arch/atool-0.39.0
index 4a7863f844ca..b02498a51c0c 100644
--- a/metadata/md5-cache/app-arch/atool-0.39.0
+++ b/metadata/md5-cache/app-arch/atool-0.39.0
@@ -2,10 +2,10 @@ DEFINED_PHASES=-
DEPEND=dev-lang/perl
DESCRIPTION=a script for managing file archives of various types
EAPI=4
-HOMEPAGE=http://www.nongnu.org/atool/
+HOMEPAGE=https://www.nongnu.org/atool/
KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
+LICENSE=GPL-2+
RDEPEND=dev-lang/perl !app-text/adiff
SLOT=0
SRC_URI=https://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz
-_md5_=448cac8fa5386b65d6dff39b477c13a1
+_md5_=4c2c0f84a2ebe16d4ba73a2cbf759749
diff --git a/metadata/md5-cache/app-arch/atool-0.39.0-r1 b/metadata/md5-cache/app-arch/atool-0.39.0-r1
new file mode 100644
index 000000000000..48b173ae9590
--- /dev/null
+++ b/metadata/md5-cache/app-arch/atool-0.39.0-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=-
+DEPEND=dev-lang/perl
+DESCRIPTION=Script for managing file archives of various types
+EAPI=7
+HOMEPAGE=https://www.nongnu.org/atool/
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2+
+RDEPEND=dev-lang/perl !app-text/adiff
+SLOT=0
+SRC_URI=https://savannah.nongnu.org/download/atool/atool-0.39.0.tar.gz
+_md5_=0336ecc48c900d3560b98884cce938a8
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 9e11d954436c..be97b764704d 100644
Binary files a/metadata/md5-cache/dev-games/Manifest.gz and b/metadata/md5-cache/dev-games/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-games/flatzebra-0.1.6 b/metadata/md5-cache/dev-games/flatzebra-0.1.6
index 9754fba3540b..82a9aaf42f2f 100644
--- a/metadata/md5-cache/dev-games/flatzebra-0.1.6
+++ b/metadata/md5-cache/dev-games/flatzebra-0.1.6
@@ -2,12 +2,12 @@ DEFINED_PHASES=configure install prepare
DEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer virtual/pkgconfig
DESCRIPTION=A generic game engine for 2D double-buffering animation
EAPI=5
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev
+HOMEPAGE=https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html
IUSE=static-libs
KEYWORDS=amd64 x86 ~x86-fbsd
LICENSE=GPL-2
RDEPEND=media-libs/libsdl[video] media-libs/sdl-image media-libs/sdl-mixer
SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/flatzebra-0.1.6.tar.gz
+SRC_URI=https://perso.b2b2c.ca/~sarrazip/dev/flatzebra-0.1.6.tar.gz
_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f063ee26a47645e34cce6ebd7c7d3ac5
+_md5_=6d6f7d2322e56de0dc98bdc321dbd7ce
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 44e0d06dfc4e..f4a785ab6482 100644
Binary files a/metadata/md5-cache/dev-python/Manifest.gz and b/metadata/md5-cache/dev-python/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-python/apptools-4.3.0 b/metadata/md5-cache/dev-python/apptools-4.3.0
deleted file mode 100644
index efab539cee28..000000000000
--- a/metadata/md5-cache/dev-python/apptools-4.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traitsui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyface-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc sci-visualization/mayavi[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traitsui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Application tools
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/apptools/ https://github.com/enthought/apptools https://pypi.org/project/apptools/
-IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traitsui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/a/apptools/apptools-4.3.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=c53bd10135d63458425c6ca95680d474
diff --git a/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1 b/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
deleted file mode 100644
index 21a4527d9091..000000000000
--- a/metadata/md5-cache/dev-python/blockcanvas-4.0.3-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/chaco-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/codetools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/etsdevtools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyface-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Numerical modeling
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/blockcanvas/ https://github.com/enthought/blockcanvas https://pypi.org/project/blockcanvas/
-IUSE=doc test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/chaco-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/codetools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/etsdevtools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyface-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/docutils[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/greenlet[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pillow[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://www.enthought.com/repo/ets/blockcanvas-4.0.3.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=5a68853c24decc4f1c5610e4cea2af43
diff --git a/metadata/md5-cache/dev-python/chaco-4.5.0 b/metadata/md5-cache/dev-python/chaco-4.5.0
deleted file mode 100644
index f72bf5c86dfe..000000000000
--- a/metadata/md5-cache/dev-python/chaco-4.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-python/enable-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Interactive plotting toolkit
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/chaco/ https://github.com/enthought/chaco https://pypi.org/project/chaco/
-IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/enable-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/chaco/chaco-4.5.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=8646db5076eaa66942dd21d8ad0e8f4a
diff --git a/metadata/md5-cache/dev-python/codetools-4.2.0 b/metadata/md5-cache/dev-python/codetools-4.2.0
deleted file mode 100644
index 80c71b6577cd..000000000000
--- a/metadata/md5-cache/dev-python/codetools-4.2.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/blockcanvas[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc virtual/python-futures[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Code analysis and execution tools
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/codetools/ https://github.com/enthought/codetools https://pypi.org/project/codetools/
-IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/c/codetools/codetools-4.2.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=a4caef2bdbe2de80e0751f9d71ad26ce
diff --git a/metadata/md5-cache/dev-python/enable-4.7.1 b/metadata/md5-cache/dev-python/enable-4.7.1
deleted file mode 100644
index be8d384a2b02..000000000000
--- a/metadata/md5-cache/dev-python/enable-4.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/apptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-lang/swig:0 dev-python/cython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/coverage[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/fonttools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/hypothesis[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/mock[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Drawing and interaction packages
-EAPI=6
-HOMEPAGE=http://docs.enthought.com/enable/ https://pypi.org/project/enable https://github.com/enthought/enable
-IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/apptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/reportlab[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-libs/freetype:2 virtual/opengl virtual/glu x11-libs/libX11 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/enthought/enable/archive/4.7.1.tar.gz -> enable-4.7.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=fc10a522d5d72902928bb262802a58fe
diff --git a/metadata/md5-cache/dev-python/enaml-0.10.2 b/metadata/md5-cache/dev-python/enaml-0.10.2
deleted file mode 100644
index 5f2c55127fd4..000000000000
--- a/metadata/md5-cache/dev-python/enaml-0.10.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/atom[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/qscintilla-2.10.3 test? ( dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: framework for writing declarative interfaces
-EAPI=6
-HOMEPAGE=https://github.com/nucleic/enaml https://pypi.org/project/enaml/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/atom[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/future[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/kiwisolver[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/ply[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/PyQt5[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] dev-python/QtPy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] >=x11-libs/qscintilla-2.10.3 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/e/enaml/enaml-0.10.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=0f7fc4f70cf13b16ee41c9513217d0c2
diff --git a/metadata/md5-cache/dev-python/encore-0.5.1 b/metadata/md5-cache/dev-python/encore-0.5.1
deleted file mode 100644
index 826717927bd0..000000000000
--- a/metadata/md5-cache/dev-python/encore-0.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] test? ( virtual/python-futures[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/nose[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/mock[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] ) python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-DESCRIPTION=Enthought Tool Suite: collection of core-level utility modules
-EAPI=5
-HOMEPAGE=https://github.com/enthought/encore
-IUSE=test python_targets_pypy python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=virtual/python-futures[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] dev-python/requests[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)] python_targets_pypy? ( >=virtual/pypy-5:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/e/encore/encore-0.5.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=0acbde1684986ef8ee2d63b289099f06
diff --git a/metadata/md5-cache/dev-python/envisage-4.4.0 b/metadata/md5-cache/dev-python/envisage-4.4.0
deleted file mode 100644
index b4e26d3f66e3..000000000000
--- a/metadata/md5-cache/dev-python/envisage-4.4.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/traits-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/apptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Extensible application framework
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/envisage/ https://github.com/enthought/envisage https://pypi.org/project/envisage/
-IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/traits-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/e/envisage/envisage-4.4.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=8ab3bdb5f7ea1ec1d1c5ec71374530ef
diff --git a/metadata/md5-cache/dev-python/ets-4.4.1-r1 b/metadata/md5-cache/dev-python/ets-4.4.1-r1
deleted file mode 100644
index fe917d994ed8..000000000000
--- a/metadata/md5-cache/dev-python/ets-4.4.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Meta package for the Enthought Tool Suite
-EAPI=5
-HOMEPAGE=https://pypi.org/project/ets/ https://github.com/enthought/ets
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/apptools-4.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/blockcanvas-4.0.3[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/casuarius-1.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/chaco-4.4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/codetools-4.2.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/enable-4.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/enaml-0.6.8[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/encore-0.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/envisage-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/etsdevtools-4.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/etsproxy-0.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/graphcanvas-4.0.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=sci-visualization/mayavi-4.3.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/pyface-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/scimath-4.1.2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traits-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4.4.0[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/e/ets/ets-4.4.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=3afb88bbb450a18af0ba15b46dee3e76
diff --git a/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1 b/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
deleted file mode 100644
index 16ae7a1f4e78..000000000000
--- a/metadata/md5-cache/dev-python/etsdevtools-4.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Tools to support Python development
-EAPI=5
-HOMEPAGE=https://github.com/enthought/etsdevtools http://docs.enthought.com/etsdevtools/ https://pypi.org/project/etsdevtools/
-IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.enthought.com/repo/ets/etsdevtools-4.0.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=9b30a96f3fc262e3ea61b4a4aace9cb3
diff --git a/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1 b/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
deleted file mode 100644
index 25a894b17f10..000000000000
--- a/metadata/md5-cache/dev-python/etsproxy-0.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Enthought Tool Suite: Proxy modules for backwards compatibility
-EAPI=5
-HOMEPAGE=https://pypi.org/project/etsproxy/
-IUSE=python_targets_python2_7
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=!=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.enthought.com/repo/ets/etsproxy-0.1.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=5a7c29ebebe1680997fa3ecf546630bc
diff --git a/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1 b/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
deleted file mode 100644
index 1586d7431d3d..000000000000
--- a/metadata/md5-cache/dev-python/graphcanvas-4.0.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Enthought Tool Suite: Interactive Graph (network) Visualization
-EAPI=5
-HOMEPAGE=https://pypi.org/project/graphcanvas/
-IUSE=examples python_targets_python2_7
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/networkx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/enable-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.enthought.com/repo/ets/graphcanvas-4.0.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=2fb1991f98020d5667c9bd202fe51983
diff --git a/metadata/md5-cache/dev-python/pyface-4.4.0-r1 b/metadata/md5-cache/dev-python/pyface-4.4.0-r1
deleted file mode 100644
index 53211d340986..000000000000
--- a/metadata/md5-cache/dev-python/pyface-4.4.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traitsui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Traits-capable windowing framework
-EAPI=5
-HOMEPAGE=https://github.com/enthought/pyface
-IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyface/pyface-4.4.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=968a3407fe44b5f30cfeb2d2c9515c47
diff --git a/metadata/md5-cache/dev-python/pyface-4.5.2-r1 b/metadata/md5-cache/dev-python/pyface-4.5.2-r1
deleted file mode 100644
index 235e9f4d411a..000000000000
--- a/metadata/md5-cache/dev-python/pyface-4.5.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traitsui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Traits-capable windowing framework
-EAPI=5
-HOMEPAGE=https://github.com/enthought/pyface
-IUSE=examples test python_targets_python2_7 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyface/pyface-4.5.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=42a5622c2f7b9085b7aab8d9080632dd
diff --git a/metadata/md5-cache/dev-python/pyface-6.0.0 b/metadata/md5-cache/dev-python/pyface-6.0.0
deleted file mode 100644
index 1183668c689b..000000000000
--- a/metadata/md5-cache/dev-python/pyface-6.0.0
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( >=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[gui,network,opengl,printsupport,svg,test?,webengine,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/traitsui[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/unittest2[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Traits-capable windowing framework
-EAPI=6
-HOMEPAGE=https://github.com/enthought/pyface
-IUSE=examples test python_targets_python2_7 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] || ( ( dev-python/pygments[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/PyQt5[gui,network,opengl,printsupport,svg,test?,webengine,widgets,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) dev-python/wxpython:*[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://pypi/p/pyface/pyface-6.0.0.tar.gz
-_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=91f5a7a8d08353712213461962f10ddf
diff --git a/metadata/md5-cache/dev-python/scimath-4.1.2-r1 b/metadata/md5-cache/dev-python/scimath-4.1.2-r1
deleted file mode 100644
index 227721b4a974..000000000000
--- a/metadata/md5-cache/dev-python/scimath-4.1.2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc x11-apps/xhost ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Scientific and mathematical tools
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/scimath/ https://github.com/enthought/scimath https://pypi.org/project/scimath/
-IUSE=doc test python_targets_python2_7 test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/traits-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4.1[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=http://www.enthought.com/repo/ets/scimath-4.1.2.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=07c44eadda15103cc956477a3d2bb244
diff --git a/metadata/md5-cache/dev-python/traits-4.5.0 b/metadata/md5-cache/dev-python/traits-4.5.0
deleted file mode 100644
index 368f5950de95..000000000000
--- a/metadata/md5-cache/dev-python/traits-4.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Explicitly typed attributes for Python
-EAPI=5
-HOMEPAGE=http://docs.enthought.com/traits/ https://github.com/enthought/traits https://pypi.org/project/traits/
-IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/t/traits/traits-4.5.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=7d274aef31776d3f7c90e5b2928bb108
diff --git a/metadata/md5-cache/dev-python/traits-4.6.0 b/metadata/md5-cache/dev-python/traits-4.6.0
deleted file mode 100644
index c9654aa47909..000000000000
--- a/metadata/md5-cache/dev-python/traits-4.6.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Explicitly typed attributes for Python
-EAPI=6
-HOMEPAGE=http://docs.enthought.com/traits/ https://github.com/enthought/traits https://pypi.org/project/traits/
-IUSE=test python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) 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_5(-)?,python_targets_python3_6(-)?,-python_single_target_python2_7(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_5 python_targets_python3_6 )
-SLOT=0
-SRC_URI=mirror://pypi/t/traits/traits-4.6.0.tar.gz
-_eclasses_=distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ec445b86a2613a1d1b334315930984d2
diff --git a/metadata/md5-cache/dev-python/traitsui-4.4.0 b/metadata/md5-cache/dev-python/traitsui-4.4.0
deleted file mode 100644
index 7332fc80fa81..000000000000
--- a/metadata/md5-cache/dev-python/traitsui-4.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Traits-capable user interfaces
-EAPI=5
-HOMEPAGE=https://github.com/enthought/traitsui
-IUSE=test python_targets_python2_7 test
-KEYWORDS=amd64 ppc ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/t/traitsui/traitsui-4.4.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=cbd81b2cfbd7092c84c22fb693218596
diff --git a/metadata/md5-cache/dev-python/traitsui-4.5.1 b/metadata/md5-cache/dev-python/traitsui-4.5.1
deleted file mode 100644
index 54403e4b5f85..000000000000
--- a/metadata/md5-cache/dev-python/traitsui-4.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Traits-capable user interfaces
-EAPI=5
-HOMEPAGE=https://github.com/enthought/traitsui
-IUSE=examples test python_targets_python2_7 test
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/traits[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=mirror://pypi/t/traitsui/traitsui-4.5.1.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=84a93ec288fe50740c803812d20a5bc8
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index 2928c1f7736a..5c10e23fb4c3 100644
Binary files a/metadata/md5-cache/dev-ruby/Manifest.gz and b/metadata/md5-cache/dev-ruby/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-2.0.7 b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.7
new file mode 100644
index 000000000000..6a28ab5edba1
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-2.0.7
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby24? ( test? ( dev-util/cucumber[ruby_targets_ruby24] dev-ruby/rspec-expectations:*[ruby_targets_ruby24] dev-ruby/asciimath[ruby_targets_ruby24] dev-ruby/coderay[ruby_targets_ruby24] dev-ruby/erubis[ruby_targets_ruby24] dev-ruby/haml[ruby_targets_ruby24] dev-ruby/nokogiri[ruby_targets_ruby24] dev-ruby/slim[ruby_targets_ruby24] dev-ruby/thread_safe[ruby_targets_ruby24] dev-ruby/tilt[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-util/cucumber[ruby_targets_ruby25] dev-ruby/rspec-expectations:*[ruby_targets_ruby25] dev-ruby/asciimath[ruby_targets_ruby25] dev-ruby/coderay[ruby_targets_ruby25] dev-ruby/erubis[ruby_targets_ruby25] dev-ruby/haml[ruby_targets_ruby25] dev-ruby/nokogiri[ruby_targets_ruby25] dev-ruby/slim[ruby_targets_ruby25] dev-ruby/thread_safe[ruby_targets_ruby25] dev-ruby/tilt[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( test? ( dev-ruby/rake[ruby_targets_ruby24] ) ) ruby_targets_ruby25? ( test? ( dev-ruby/rake[ruby_targets_ruby25] ) ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) test? ( ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] ) )
+DESCRIPTION=Processor for converting AsciiDoc into HTML 5, DocBook 4.5 and other formats
+EAPI=6
+HOMEPAGE=https://github.com/asciidoctor/asciidoctor
+IUSE=elibc_FreeBSD ruby_targets_ruby24 ruby_targets_ruby25 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby24? ( dev-lang/ruby:2.4 ) ruby_targets_ruby25? ( dev-lang/ruby:2.5 ) ruby_targets_ruby24? ( virtual/rubygems[ruby_targets_ruby24] ) ruby_targets_ruby25? ( virtual/rubygems[ruby_targets_ruby25] )
+REQUIRED_USE=|| ( ruby_targets_ruby24 ruby_targets_ruby25 )
+SLOT=0
+SRC_URI=https://github.com/asciidoctor/asciidoctor/archive/v2.0.7.tar.gz -> asciidoctor-2.0.7.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=847915387a3cd83b2f9ba1f4ba1c20db
diff --git a/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.16 b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.16
new file mode 100644
index 000000000000..593b196a8cb6
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/asciidoctor-diagram-1.5.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=test? ( ruby_targets_ruby23? ( =dev-ruby/asciidoctor-1.5*[ruby_targets_ruby23] asciidoctor-diagram-1.5.16.tar.gz
+_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 java-utils-2 dd352559d0e143500ec878acc74da909 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 ruby-fakegem 4044516b167f460104703fee4a3c7f5f ruby-ng 9ffc1c055a3294fcc48de781c94825f6 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748
+_md5_=0dd009e624c6c99c0c785a2cfee0d43c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 44aa7c28b494..702323653092 100644
Binary files a/metadata/md5-cache/dev-util/Manifest.gz and b/metadata/md5-cache/dev-util/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.150.3 b/metadata/md5-cache/dev-util/jenkins-bin-2.150.3
deleted file mode 100644
index b5d965eec24d..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.150.3
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Extensible continuous integration server
-EAPI=7
-HOMEPAGE=https://jenkins.io/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.150.3/jenkins.war -> jenkins-bin-2.150.3.war
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=4452adb3375232a273bdea0aa5f43d64
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.164 b/metadata/md5-cache/dev-util/jenkins-bin-2.164
deleted file mode 100644
index b40348e63374..000000000000
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.164
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install setup
-DESCRIPTION=Extensible continuous integration server
-EAPI=7
-HOMEPAGE=https://jenkins.io/
-KEYWORDS=~amd64 ~x86 ~amd64-linux
-LICENSE=MIT
-RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
-RESTRICT=mirror
-SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/2.164/jenkins.war -> jenkins-bin-2.164.war
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
-_md5_=9473c1ab94afe7c3b6ce520b05bfad41
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.150.2 b/metadata/md5-cache/dev-util/jenkins-bin-2.164.2
similarity index 84%
rename from metadata/md5-cache/dev-util/jenkins-bin-2.150.2
rename to metadata/md5-cache/dev-util/jenkins-bin-2.164.2
index 81fb360840df..a955fbeb9275 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.150.2
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.164.2
@@ -8,6 +8,6 @@ LICENSE=MIT
RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:0 >=virtual/jre-1.8.0
RESTRICT=mirror
SLOT=lts
-SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.150.2/jenkins.war -> jenkins-bin-2.150.2.war
+SRC_URI=http://mirrors.jenkins-ci.org/war-stable/2.164.2/jenkins.war -> jenkins-bin-2.164.2.war
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
_md5_=4452adb3375232a273bdea0aa5f43d64
diff --git a/metadata/md5-cache/dev-util/jenkins-bin-2.160 b/metadata/md5-cache/dev-util/jenkins-bin-2.172
similarity index 86%
rename from metadata/md5-cache/dev-util/jenkins-bin-2.160
rename to metadata/md5-cache/dev-util/jenkins-bin-2.172
index 5130775c7ab0..e785ff11031f 100644
--- a/metadata/md5-cache/dev-util/jenkins-bin-2.160
+++ b/metadata/md5-cache/dev-util/jenkins-bin-2.172
@@ -8,6 +8,6 @@ LICENSE=MIT
RDEPEND=media-fonts/dejavu media-libs/freetype !dev-util/jenkins-bin:lts >=virtual/jre-1.8.0
RESTRICT=mirror
SLOT=0
-SRC_URI=http://mirrors.jenkins-ci.org/war/2.160/jenkins.war -> jenkins-bin-2.160.war
+SRC_URI=http://mirrors.jenkins-ci.org/war/2.172/jenkins.war -> jenkins-bin-2.172.war
_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9 user 8bd74731cafdcdad8f7a63637302e073
_md5_=9473c1ab94afe7c3b6ce520b05bfad41
diff --git a/metadata/md5-cache/dev-vcs/Manifest.gz b/metadata/md5-cache/dev-vcs/Manifest.gz
index ee0885cc54a1..035f52bc5830 100644
Binary files a/metadata/md5-cache/dev-vcs/Manifest.gz and b/metadata/md5-cache/dev-vcs/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.12.0_rc1 b/metadata/md5-cache/dev-vcs/subversion-1.12.0_rc1
index e9ed139a25d5..b98127de8103 100644
--- a/metadata/md5-cache/dev-vcs/subversion-1.12.0_rc1
+++ b/metadata/md5-cache/dev-vcs/subversion-1.12.0_rc1
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) perl? ( dev-lang/swig ) python? ( dev-lang/swig ) ruby? ( dev-lang/swig ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
DESCRIPTION=Advanced version control system
EAPI=6
HOMEPAGE=https://subversion.apache.org/
IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.3 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
+RDEPEND=app-arch/bzip2 app-arch/lz4 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat dev-libs/libutf8proc:= sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.4 dev-lang/ruby:2.5 dev-lang/ruby:2.6 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
SLOT=0
SRC_URI=mirror://apache/subversion/subversion-1.12.0-rc1.tar.bz2 https://dev.gentoo.org/~polynomial-c/subversion-1.10.0_rc1-patches-1.tar.xz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb db-use 501a5d0963e0d17f30260023f292ae8e depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=1d13bee98cece1db189f4adfd446c901
+_md5_=f30303a59b88fbb788365ffa22127be2
diff --git a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1 b/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
deleted file mode 100644
index b45909dfaefa..000000000000
--- a/metadata/md5-cache/dev-vcs/subversion-1.9.7-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare setup test
-DEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) !!=virtual/jdk-1.5 ) kwallet? ( kde-frameworks/kdelibs4support:5 virtual/pkgconfig ) nls? ( sys-devel/gettext ) test? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) apache2? ( =www-servers/apache-2* ) >=app-portage/elt-patches-20170815 !=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 java? ( >=dev-java/java-config-2.2.0-r3 )
-DESCRIPTION=Advanced version control system
-EAPI=6
-HOMEPAGE=https://subversion.apache.org/
-IUSE=apache2 berkdb ctypes-python debug doc +dso extras gnome-keyring +http java kwallet nls perl python ruby sasl test vim-syntax apache2 python_targets_python2_7 elibc_FreeBSD java
-KEYWORDS=~arm64 ~mips s390 ~sh ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=Subversion GPL-2
-RDEPEND=app-arch/bzip2 >=dev-db/sqlite-3.7.12 >=dev-libs/apr-1.3:1 >=dev-libs/apr-util-1.3:1 dev-libs/expat sys-apps/file sys-libs/zlib berkdb? ( >=sys-libs/db-4.0.14:= ) ctypes-python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) gnome-keyring? ( dev-libs/glib:2 gnome-base/libgnome-keyring sys-apps/dbus ) http? ( >=net-libs/serf-1.3.4 ) kwallet? ( dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 kde-frameworks/kcoreaddons:5 kde-frameworks/ki18n:5 kde-frameworks/kwallet:5 sys-apps/dbus ) perl? ( dev-lang/perl:= ) python? ( python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) ruby? ( || ( dev-lang/ruby:2.3 ) virtual/rubygems ) sasl? ( dev-libs/cyrus-sasl ) apache2? ( www-servers/apache[apache2_modules_dav] ) java? ( >=virtual/jre-1.5 ) nls? ( virtual/libintl ) perl? ( dev-perl/URI ) apache2? ( =www-servers/apache-2* ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=ctypes-python? ( || ( python_targets_python2_7 ) ) python? ( || ( python_targets_python2_7 ) ) test? ( || ( python_targets_python2_7 ) !dso )
-SLOT=0
-SRC_URI=mirror://apache/subversion/subversion-1.9.7.tar.bz2 https://dev.gentoo.org/~mgorny/dist/subversion-1.8.18-patchset.tar.bz2
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 bash-completion-r1 47a7402d95930413ce25ba8d857339bb db-use 501a5d0963e0d17f30260023f292ae8e depend.apache 05ca915dc22ea60059f85d8d9a34d3de desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 elisp-common 23f47b2e1de7abf387105eddd1318738 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 flag-o-matic a09389deba2c0a7108b581e02c7cecbf java-pkg-opt-2 77d2e22d0de7640f817d20e861c0ff3f java-utils-2 dd352559d0e143500ec878acc74da909 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 perl-functions f2e3420aed32cf1abe33b4129b842636 perl-module 71c828c354a4cddced2641dda2695de5 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f ruby-single e6530f43a549f120f9396ccb852288f5 ruby-utils 10cec86289e60f4b0d731b2e4b545e5d toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ce33245724a9bc2e5ddaf138fcc70c29
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index 68f614dea5d7..5acd57dcf39e 100644
Binary files a/metadata/md5-cache/games-arcade/Manifest.gz and b/metadata/md5-cache/games-arcade/Manifest.gz differ
diff --git a/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1 b/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
index d6e438feb74f..9e113e875a65 100644
--- a/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
+++ b/metadata/md5-cache/games-arcade/batrachians-0.1.6-r1
@@ -2,11 +2,11 @@ DEFINED_PHASES=compile configure install postinst postrm preinst prepare
DEPEND=>=dev-games/flatzebra-0.1.5 virtual/pkgconfig >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 app-arch/xz-utils dev-util/desktop-file-utils x11-misc/shared-mime-info
DESCRIPTION=A fly-eating frog video game
EAPI=6
-HOMEPAGE=http://perso.b2b2c.ca/sarrazip/dev/batrachians.html
+HOMEPAGE=https://perso.b2b2c.ca/~sarrazip/dev/batrachians.html
KEYWORDS=~amd64 ~x86
LICENSE=GPL-2
RDEPEND=>=dev-games/flatzebra-0.1.5
SLOT=0
-SRC_URI=http://perso.b2b2c.ca/sarrazip/dev/batrachians-0.1.6.tar.gz
+SRC_URI=https://perso.b2b2c.ca/~sarrazip/dev/batrachians-0.1.6.tar.gz
_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d eapi7-ver 756b3f27d8e46131d5cf3c51bd876446 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 gnome.org 532d56d07b9eace4831aaa817d2b756a gnome2 1a42e8c41af42cb294817dcc5b7e3df6 gnome2-utils 532371cfcba45b2ab0d2950547c97d95 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf versionator 2352c3fc97241f6a02042773c8287748 xdg c7ba313ea1eaf266f95cc6235f7d6a07 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=e989f540e94f19311f03e8bec7d02ef1
+_md5_=5a3a94a0d30dd42551b00cb90341e45c
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 850a945337c3..f4838e40406d 100644
Binary files a/metadata/md5-cache/media-libs/Manifest.gz and b/metadata/md5-cache/media-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/media-libs/libpng-1.6.36 b/metadata/md5-cache/media-libs/libpng-1.6.36
index 977d6f8ffb3b..634964c4f9aa 100644
--- a/metadata/md5-cache/media-libs/libpng-1.6.36
+++ b/metadata/md5-cache/media-libs/libpng-1.6.36
@@ -5,9 +5,9 @@ EAPI=6
HOMEPAGE=http://www.libpng.org/
IUSE=apng cpu_flags_x86_sse neon static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_ppc_32 abi_ppc_64 abi_s390_32 abi_s390_64
KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=libpng
+LICENSE=libpng2
RDEPEND=>=sys-libs/zlib-1.2.8-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(-)?]
SLOT=0/16
SRC_URI=mirror://sourceforge/libpng/libpng-1.6.36.tar.xz apng? ( mirror://sourceforge/apng/libpng-1.6.36-apng.patch.gz )
_eclasses_=libtool f143db5a74ccd9ca28c1234deffede96 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multilib-build b42436dc1260f475af229754c165cb6b multilib-minimal 8bddda43703ba94d8341f4e247f97566 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=cb97909e9288597b47489749a3f39614
+_md5_=8cad77e465d1ead6f31ee6e31c35d8d5
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index fcf8aef3f7d8..8eabe57c3c5e 100644
Binary files a/metadata/md5-cache/net-analyzer/Manifest.gz and b/metadata/md5-cache/net-analyzer/Manifest.gz differ
diff --git a/metadata/md5-cache/net-analyzer/libnasl-2.2.9-r1 b/metadata/md5-cache/net-analyzer/libnasl-2.2.9-r1
deleted file mode 100644
index ca375284cbc4..000000000000
--- a/metadata/md5-cache/net-analyzer/libnasl-2.2.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~net-analyzer/nessus-libraries-2.2.9 sys-devel/bison
-DESCRIPTION=A remote security scanner for Linux (libnasl)
-EAPI=5
-HOMEPAGE=http://www.nessus.org/
-IUSE=static-libs
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=~net-analyzer/nessus-libraries-2.2.9
-SLOT=0
-SRC_URI=ftp://ftp.nessus.org/pub/nessus/nessus-2.2.9/src/libnasl-2.2.9.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=0ae8fadb806c1294d7f2480e4f403981
diff --git a/metadata/md5-cache/net-analyzer/nessus-2.2.9 b/metadata/md5-cache/net-analyzer/nessus-2.2.9
deleted file mode 100644
index 2c96253095aa..000000000000
--- a/metadata/md5-cache/net-analyzer/nessus-2.2.9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=postinst postrm
-DESCRIPTION=A remote security scanner
-EAPI=0
-HOMEPAGE=http://www.nessus.org/
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=~net-analyzer/nessus-libraries-2.2.9 ~net-analyzer/libnasl-2.2.9 ~net-analyzer/nessus-core-2.2.9 ~net-analyzer/nessus-plugins-2.2.9
-SLOT=0
-_md5_=2be110658ec121f23f9181009e5581be
diff --git a/metadata/md5-cache/net-analyzer/nessus-client-1.0.2-r2 b/metadata/md5-cache/net-analyzer/nessus-client-1.0.2-r2
deleted file mode 100644
index e8652c1da7d8..000000000000
--- a/metadata/md5-cache/net-analyzer/nessus-client-1.0.2-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=!net-analyzer/nessus-core !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-libs/gtk+-2.8.8:2 virtual/pkgconfig doc? ( app-text/htmldoc )
-DESCRIPTION=A client for the Nessus vulnerability scanner
-EAPI=5
-HOMEPAGE=http://www.nessus.org/
-IUSE=libressl doc
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=!net-analyzer/nessus-core !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) >=x11-libs/gtk+-2.8.8:2
-SLOT=0
-SRC_URI=mirror://gentoo/NessusClient-1.0.2.tar.gz mirror://gentoo/nessus-client.png.bz2
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=3f8c0cd26f5427a46ccec8764f3924b5
diff --git a/metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1 b/metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1
deleted file mode 100644
index e2078dbe8f0e..000000000000
--- a/metadata/md5-cache/net-analyzer/nessus-core-2.2.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=~net-analyzer/nessus-libraries-2.2.9 ~net-analyzer/libnasl-2.2.9 tcpd? ( sys-apps/tcp-wrappers ) gtk? ( x11-libs/gtk+:2 ) prelude? ( dev-libs/libprelude ) !net-analyzer/nessus-client virtual/pkgconfig >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
-DESCRIPTION=A remote security scanner for Linux (nessus-core)
-EAPI=4
-HOMEPAGE=http://www.nessus.org/
-IUSE=debug gtk prelude tcpd
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=GPL-2
-RDEPEND=~net-analyzer/nessus-libraries-2.2.9 ~net-analyzer/libnasl-2.2.9 tcpd? ( sys-apps/tcp-wrappers ) gtk? ( x11-libs/gtk+:2 ) prelude? ( dev-libs/libprelude ) !net-analyzer/nessus-client
-SLOT=0
-SRC_URI=ftp://ftp.nessus.org/pub/nessus/nessus-2.2.9/src/nessus-core-2.2.9.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 libtool f143db5a74ccd9ca28c1234deffede96 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=f6943c5f2f567e652c222191a949aa9c
diff --git a/metadata/md5-cache/net-analyzer/nessus-libraries-2.2.9-r1 b/metadata/md5-cache/net-analyzer/nessus-libraries-2.2.9-r1
deleted file mode 100644
index 0c47c6a8191b..000000000000
--- a/metadata/md5-cache/net-analyzer/nessus-libraries-2.2.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libpcap
-DESCRIPTION=A remote security scanner for Linux (nessus-libraries)
-EAPI=5
-HOMEPAGE=http://www.nessus.org/
-IUSE=crypt debug libressl static-libs
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) net-libs/libpcap
-SLOT=0
-SRC_URI=ftp://ftp.nessus.org/pub/nessus/nessus-2.2.9/src/nessus-libraries-2.2.9.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=5c20f71cad074082f0fd1bf265505b2a
diff --git a/metadata/md5-cache/net-analyzer/nessus-plugins-2.2.9-r1 b/metadata/md5-cache/net-analyzer/nessus-plugins-2.2.9-r1
deleted file mode 100644
index ce70a84e9b3e..000000000000
--- a/metadata/md5-cache/net-analyzer/nessus-plugins-2.2.9-r1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install prepare
-DEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ~net-analyzer/nessus-core-2.2.9 ~net-analyzer/nessus-libraries-2.2.9 net-libs/libpcap
-DESCRIPTION=A remote security scanner for Linux (nessus-plugins)
-EAPI=5
-HOMEPAGE=http://www.nessus.org/
-IUSE=libressl
-KEYWORDS=~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=!libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ~net-analyzer/nessus-core-2.2.9 ~net-analyzer/nessus-libraries-2.2.9 net-libs/libpcap
-SLOT=0
-SRC_URI=ftp://ftp.nessus.org/pub/nessus/nessus-2.2.9/src/nessus-plugins-GPL-2.2.9.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multilib b2f01ad412baf81650c23fcf0975fa33 preserve-libs ef207dc62baddfddfd39a164d9797648 toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf
-_md5_=7ad587bec2ee47be8a1382b20ff38e24
diff --git a/metadata/md5-cache/net-analyzer/prelude-nessus-20021107 b/metadata/md5-cache/net-analyzer/prelude-nessus-20021107
deleted file mode 100644
index abc92ccc34e6..000000000000
--- a/metadata/md5-cache/net-analyzer/prelude-nessus-20021107
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=dev-lang/perl
-DESCRIPTION=Nessus Correlation support for Prelude-IDS
-EAPI=4
-HOMEPAGE=http://www.rstack.org/oudot/prelude/correlation/
-KEYWORDS=~amd64 ~ppc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=mirror://gentoo/prelude-correlation-20021107.tar.bz2
-_md5_=c8af7157f077c63bf8341aff8fbdc52d
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index c7e7271da3ab..2643db90b350 100644
Binary files a/metadata/md5-cache/net-libs/Manifest.gz and b/metadata/md5-cache/net-libs/Manifest.gz differ
diff --git a/metadata/md5-cache/net-libs/libupnpp-0.16.1 b/metadata/md5-cache/net-libs/libupnpp-0.16.1
index 99002ccba237..95d010fd7879 100644
--- a/metadata/md5-cache/net-libs/libupnpp-0.16.1
+++ b/metadata/md5-cache/net-libs/libupnpp-0.16.1
@@ -2,10 +2,10 @@ DEFINED_PHASES=-
DEPEND=dev-libs/expat =dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) >=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=tinc is an easy to configure VPN implementation
-EAPI=6
-HOMEPAGE=http://www.tinc-vpn.org/
-IUSE=+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib python_targets_python2_7
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos
-LICENSE=GPL-2
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),-python_single_target_python3_5(-),-python_single_target_python3_6(-),-python_single_target_python3_7(-),python_single_target_python2_7(+)] ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) ) lzo? ( dev-libs/lzo:2 ) ncurses? ( sys-libs/ncurses:= ) readline? ( sys-libs/readline:= ) upnp? ( net-libs/miniupnpc ) zlib? ( sys-libs/zlib ) vde? ( net-misc/vde )
-REQUIRED_USE=python_targets_python2_7
-SLOT=0
-SRC_URI=http://www.tinc-vpn.org/packages/tinc-1.1pre16.tar.gz
-_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-single-r1 3a0fc81f484bfdbd9c2b7448015a36e4 python-utils-r1 08e17157a6807add7db1f8d01e7e391f systemd 71fd8d2065d102753fb9e4d20eaf3e9f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=d4b0a6cf7f23fdb2294e97b4ed141ab8
diff --git a/metadata/md5-cache/sci-chemistry/Manifest.gz b/metadata/md5-cache/sci-chemistry/Manifest.gz
index 855261ee494b..a52857d23ba1 100644
Binary files a/metadata/md5-cache/sci-chemistry/Manifest.gz and b/metadata/md5-cache/sci-chemistry/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-chemistry/prody-1.6 b/metadata/md5-cache/sci-chemistry/prody-1.6
deleted file mode 100644
index 16f6861632a5..000000000000
--- a/metadata/md5-cache/sci-chemistry/prody-1.6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-biology/biopython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Protein Dynamics Analysis
-EAPI=5
-HOMEPAGE=http://prody.csb.pitt.edu/ https://github.com/prody/ProDy
-IUSE=test python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/matplotlib[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyparsing[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-biology/biopython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-libs/scipy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/prody/ProDy/archive/v1.6.tar.gz -> prody-1.6.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=ec3075eb7c34897bec8cd637a3b26c45
diff --git a/metadata/md5-cache/sci-chemistry/pymol-plugins-dynamics-2.0.7 b/metadata/md5-cache/sci-chemistry/pymol-plugins-dynamics-2.0.7
deleted file mode 100644
index f150d065bac8..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-plugins-dynamics-2.0.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/prody[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Molecular dynamics in Pymol
-EAPI=6
-HOMEPAGE=https://github.com/tomaszmakarewicz/Dynamics
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/prody[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/tomaszmakarewicz/Dynamics/archive/v2.0.7.tar.gz -> pymol-plugins-dynamics-2.0.7.tar.gz
-_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=626974d8e11dfbb3f90a248241b45aee
diff --git a/metadata/md5-cache/sci-chemistry/pymol-plugins-dynamics-2.1.1 b/metadata/md5-cache/sci-chemistry/pymol-plugins-dynamics-2.1.1
deleted file mode 100644
index a7acffbdaace..000000000000
--- a/metadata/md5-cache/sci-chemistry/pymol-plugins-dynamics-2.1.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/prody[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-DESCRIPTION=Molecular dynamics in Pymol
-EAPI=6
-HOMEPAGE=https://github.com/tomaszmakarewicz/Dynamics
-IUSE=python_targets_python2_7
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-3
-RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] sci-chemistry/prody[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=0
-SRC_URI=https://github.com/tomaszmakarewicz/Dynamics/archive/v2.1.1.tar.gz -> pymol-plugins-dynamics-2.1.1.tar.gz
-_eclasses_=multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=626974d8e11dfbb3f90a248241b45aee
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index e3ef6b575cca..6c42c2f0702b 100644
Binary files a/metadata/md5-cache/sci-visualization/Manifest.gz and b/metadata/md5-cache/sci-visualization/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-visualization/mayavi-4.3.0 b/metadata/md5-cache/sci-visualization/mayavi-4.3.0
deleted file mode 100644
index 7aaed5d2c8a3..000000000000
--- a/metadata/md5-cache/sci-visualization/mayavi-4.3.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/vtk[python] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/envisage-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[opengl] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Scientific data 3-dimensional visualizer
-EAPI=5
-HOMEPAGE=http://code.enthought.com/projects/mayavi/ https://pypi.org/project/mayavi/
-IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/envisage-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=2
-SRC_URI=http://www.enthought.com/repo/ets/mayavi-4.3.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=298e1735f6cec243a0e8cc8b5c68238d
diff --git a/metadata/md5-cache/sci-visualization/mayavi-4.5.0 b/metadata/md5-cache/sci-visualization/mayavi-4.5.0
deleted file mode 100644
index 59d38681e038..000000000000
--- a/metadata/md5-cache/sci-visualization/mayavi-4.5.0
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=sci-libs/vtk[python,rendering] dev-python/setuptools[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) test? ( >=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/envisage-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:*[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/nose[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython[opengl] media-fonts/font-cursor-misc media-fonts/font-misc-misc ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Enthought Tool Suite: Scientific data 3-dimensional visualizer
-EAPI=5
-HOMEPAGE=http://code.enthought.com/projects/mayavi/ https://pypi.org/project/mayavi/
-IUSE=doc examples test python_targets_python2_7 test
-KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=dev-python/apptools-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/configobj[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/envisage-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/ipython[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/numpy[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/pyface[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] >=dev-python/traitsui-4[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] dev-python/wxpython:*[opengl,python_targets_python2_7(-)?,-python_single_target_python2_7(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,-python_single_target_python2_7(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 )
-SLOT=2
-SRC_URI=https://github.com/enthought/mayavi/archive/4.5.0.tar.gz -> mayavi-4.5.0.tar.gz
-_eclasses_=desktop b1d22ac8bdd4679ab79c71aca235009d distutils-r1 30044897f9a75ab6414bdb19aa3c07d4 epatch a1bf4756dba418a7238f3be0cb010c54 estack 43ddf5aaffa7a8d0482df54d25a66a1f eutils 6e6c2737b59a4b982de6fb3ecefd87f8 ltprune 2729691420b6deeda2a90b1f1183fb55 multibuild 40fe59465edacd730c644ec2bc197809 multilib b2f01ad412baf81650c23fcf0975fa33 multiprocessing cac3169468f893670dac3e7cb940e045 preserve-libs ef207dc62baddfddfd39a164d9797648 python-r1 ce1cd23cfdc1848e8e32743efe34f299 python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 vcs-clean 2a0f74a496fa2b1552c4f3398258b7bf virtualx 401b718cc14d43a5a7fbe062c4851ba5 xdg-utils 14d00d009167652b1fa363e55effe213
-_md5_=08eb746eb7347e854d44fe60234f98b4
diff --git a/metadata/md5-cache/sec-policy/Manifest.gz b/metadata/md5-cache/sec-policy/Manifest.gz
index 855046d5afbd..30c69a64d16c 100644
Binary files a/metadata/md5-cache/sec-policy/Manifest.gz and b/metadata/md5-cache/sec-policy/Manifest.gz differ
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
deleted file mode 100644
index ff7c9d48fdb7..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2
-_eclasses_=selinux-policy-2 a877fdfed4ddd74aa04c64b88cdd974c
-_md5_=8befb8f2d28a7925d288d8a5afb1e2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
deleted file mode 100644
index 24c97c8078fe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r2
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2
-_eclasses_=selinux-policy-2 a877fdfed4ddd74aa04c64b88cdd974c
-_md5_=8befb8f2d28a7925d288d8a5afb1e2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3
deleted file mode 100644
index de6987187a53..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180114-r3
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180114-r3
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180114/refpolicy-2.20180114.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2
-_eclasses_=selinux-policy-2 a877fdfed4ddd74aa04c64b88cdd974c
-_md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r1 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r1
deleted file mode 100644
index 17ed680523fe..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=amd64 -arm ~arm64 ~mips x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2
-_eclasses_=selinux-policy-2 a877fdfed4ddd74aa04c64b88cdd974c
-_md5_=8befb8f2d28a7925d288d8a5afb1e2c5
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r2 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r2
deleted file mode 100644
index 0cbbe3bb8556..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20180701-r2
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r2 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20180701-r2
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20180701/refpolicy-2.20180701.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20180701-r2.tar.bz2
-_eclasses_=selinux-policy-2 a877fdfed4ddd74aa04c64b88cdd974c
-_md5_=5e72c71881661e2ac9107c967e0e9092
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-2.20190201-r1 b/metadata/md5-cache/sec-policy/selinux-nessus-2.20190201-r1
deleted file mode 100644
index e41f5c495f36..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-2.20190201-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190201-r1 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-KEYWORDS=~amd64 -arm ~arm64 ~mips ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-2.20190201-r1
-SLOT=0
-SRC_URI=https://github.com/SELinuxProject/refpolicy/releases/download/RELEASE_2_20190201/refpolicy-2.20190201.tar.bz2 https://dev.gentoo.org/~swift/patches/selinux-base-policy/patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2
-_eclasses_=selinux-policy-2 a877fdfed4ddd74aa04c64b88cdd974c
-_md5_=fba9b66ceda7820224299fb22d17cb3d
diff --git a/metadata/md5-cache/sec-policy/selinux-nessus-9999 b/metadata/md5-cache/sec-policy/selinux-nessus-9999
deleted file mode 100644
index e97e1ae1c53c..000000000000
--- a/metadata/md5-cache/sec-policy/selinux-nessus-9999
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=compile install postinst postrm prepare unpack
-DEPEND=>=dev-vcs/git-1.8.2.1[curl] >=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999 sys-devel/m4 >=sys-apps/checkpolicy-2.0.21
-DESCRIPTION=SELinux policy for nessus
-EAPI=6
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:SELinux
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/policycoreutils-2.0.82 >=sec-policy/selinux-base-policy-9999
-SLOT=0
-_eclasses_=git-r3 0d4635eeb5a96cd5315597a47eba25c9 selinux-policy-2 a877fdfed4ddd74aa04c64b88cdd974c
-_md5_=f3bcb4c88505aa365d6a35e1b358a6a3
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index ac4b7cd901a1..67070e92502e 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/mozplugger-2.1.6 b/metadata/md5-cache/www-plugins/mozplugger-2.1.6
deleted file mode 100644
index 460a702ae937..000000000000
--- a/metadata/md5-cache/www-plugins/mozplugger-2.1.6
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install
-DEPEND=x11-libs/libX11
-DESCRIPTION=Streaming media plugin for Mozilla, based on netscape-plugger
-EAPI=5
-HOMEPAGE=http://mozplugger.mozdev.org/
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=x11-libs/libX11
-SLOT=0
-SRC_URI=http://mozplugger.mozdev.org/files/mozplugger-2.1.6.tar.gz
-_eclasses_=multilib b2f01ad412baf81650c23fcf0975fa33 toolchain-funcs b45201c4e6c096b98e250336954e64b9
-_md5_=b9775de24692828126dbe88aa64dfd5c
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index c48a8e55a68d..9e1a462af2f7 100644
Binary files a/metadata/md5-cache/xfce-extra/Manifest.gz and b/metadata/md5-cache/xfce-extra/Manifest.gz differ
diff --git a/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6 b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6
new file mode 100644
index 000000000000..166e35f6bdc0
--- /dev/null
+++ b/metadata/md5-cache/xfce-extra/xfce4-windowck-plugin-0.4.6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815 !=sys-devel/automake-1.16.1:1.16 >=sys-devel/automake-1.15.1:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DEFINED_PHASES=postinst postrm prepare setup
+DEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:= || ( dev-lang/python:3.7 dev-lang/python:3.6 ) dev-util/intltool dev-util/xfce4-dev-tools media-gfx/imagemagick[png] sys-devel/gettext virtual/pkgconfig
+DESCRIPTION=Xfce plugin puts the maximized window title and windows buttons on the panel
+EAPI=7
+HOMEPAGE=https://github.com/cedl38/xfce4-windowck-plugin
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=x11-libs/gtk+-2.20:2 x11-libs/libX11 >=x11-libs/libwnck-2.30:1 >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.10:=
+SLOT=0
+SRC_URI=https://github.com/cedl38/xfce4-windowck-plugin/archive/v0.4.6.tar.gz -> xfce4-windowck-plugin-0.4.6.tar.gz
+_eclasses_=autotools 1bf086cdd7356f5c9a4acd9727bd2065 libtool f143db5a74ccd9ca28c1234deffede96 multilib b2f01ad412baf81650c23fcf0975fa33 python-any-r1 4900ae970f827a22d33d41bd8b8f9ace python-utils-r1 08e17157a6807add7db1f8d01e7e391f toolchain-funcs b45201c4e6c096b98e250336954e64b9 xdg-utils 14d00d009167652b1fa363e55effe213
+_md5_=a24188f554cbb7bf46e1286adc8c729c
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 8ffc9cfb0c24..b263d18bc1bb 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Apr 2019 04:38:43 +0000
+Mon, 15 Apr 2019 08:38:46 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 594a00ffe568..027597f6251c 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Apr 15 04:38:43 UTC 2019
+Mon Apr 15 08:38:46 UTC 2019
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index e81a349e5ba7..7d701fba5e4a 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Apr 2019 05:00:01 +0000
+Mon, 15 Apr 2019 09:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index da7841c4bcec..7270e6b591cd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e02c103ecb8301d891d89af3b88c655492f47c42 1555292029 2019-04-15T01:33:49+00:00
+53301f78cea7f8fffa32759382ef18c1ddd8be9a 1555317246 2019-04-15T08:34:06+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index c3fa10ac4732..1a5d595ddaee 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1555302901 Mon 15 Apr 2019 04:35:01 AM UTC
+1555317301 Mon 15 Apr 2019 08:35:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 8ffc9cfb0c24..b263d18bc1bb 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 15 Apr 2019 04:38:43 +0000
+Mon, 15 Apr 2019 08:38:46 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index dcfb9ad5e915..603b7ed6dfb3 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/libnasl/Manifest b/net-analyzer/libnasl/Manifest
deleted file mode 100644
index 8d0f717bbc84..000000000000
--- a/net-analyzer/libnasl/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST libnasl-2.2.9.tar.gz 366960 BLAKE2B 4d5b5259c6bd1184d2bdf8f72a0e1f327666150f7d943c0343560d8ff0596819db10437f714c5fb7440afadf947492112c667bf224248f994be474ceb87243d9 SHA512 74a637d39f0d61c9e0f692d3a6754000ef635690a61b05c88608fd5bbee438ce720597babe25af80bccd4fca52f22531b3fc913820a13147c179f8a16c034e03
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
deleted file mode 100644
index 91f91fa38e09..000000000000
--- a/net-analyzer/libnasl/files/libnasl-2.2.9-bison3.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- a/nasl/nasl_grammar.y
-+++ b/nasl/nasl_grammar.y
-@@ -1,4 +1,6 @@
--%pure_parser
-+%pure-parser
-+%parse-param {naslctxt * parm}
-+%lex-param {naslctxt * parm}
- %expect 1
- %{
- /* Nessus Attack Scripting Language version 2
-@@ -31,7 +33,7 @@
- #include "nasl_lex_ctxt.h"
- #include "nasl_debug.h"
-
--static void naslerror(const char *);
-+static void naslerror(naslctxt *, const char *);
- #define YYERROR_VERBOSE
- %}
-
-@@ -465,8 +467,7 @@
- #include
- #include
-
--static void
--naslerror(const char *s)
-+static void naslerror(naslctxt *parm, const char *s)
- {
- fputs(s, stderr);
- }
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
deleted file mode 100644
index c82f76d60016..000000000000
--- a/net-analyzer/libnasl/files/libnasl-2.2.9-gentoo.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-index 860653d..82bdf2f 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,7 +1,7 @@
- include nasl.tmpl
-
- all:
-- cd nasl && ${MAKE}
-+ ${MAKE} -C nasl
-
- nasl.tmpl: nasl.tmpl.in configure
- $(SHELL) configure $(CONFIGURE_ARGS)
---- a/nasl/Makefile
-+++ b/nasl/Makefile
-@@ -97,11 +97,11 @@ cflags :
- @echo "echo \"$(NESSUS_CFLAGS) $(include) $(DEFS) \"" > cflags
- @chmod +x cflags
-
--nasl : cflags $(OBJS) nasl.c
-- $(CC) $(CFLAGS) $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS)
-+nasl : cflags $(OBJS) nasl.c libnasl.la
-+ $(CC) $(CFLAGS) $(LDFLAGS) $(NESSUS_INCLUDE) $(include) -o nasl -DVERSION=\"$(VERSION)\" nasl.c $(OBJS) $(NESSUS_LIBS)
-
- libnasl.la : cflags $(OBJS)
-- $(COMPILE) $(NESSUS_LIBS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
-+ $(COMPILE) $(NESSUS_LIBS) $(LDFLAGS) -o libnasl.la $(LO_OBJS) -rpath ${libdir} \
- -version-info ${PACKAGE_VERSION}
-
- install : libnasl.la nasl
diff --git a/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch b/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
deleted file mode 100644
index fc3b38be4c2e..000000000000
--- a/net-analyzer/libnasl/files/libnasl-2.2.9-openssl-1.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-http://bugs.gentoo.org/326545
-
---- a/nasl/nasl_crypto.c
-+++ b/nasl/nasl_crypto.c
-@@ -22,7 +22,9 @@
- */
- #include
- #ifdef HAVE_SSL
-+#ifdef HAVE_OPENSSL_MD2_H
- #include
-+#endif
- #include
- #include
- #include
-@@ -45,6 +47,7 @@
-
-
- /*-------------------[ Std. HASH ]-------------------------------------*/
-+#ifdef HAVE_OPENSSL_MD2_H
- tree_cell * nasl_md2(lex_ctxt * lexic)
- {
- char * data = get_str_var_by_num(lexic, 0);
-@@ -63,6 +66,7 @@
- retc->size = MD2_DIGEST_LENGTH;
- return retc;
- }
-+#endif
-
- tree_cell * nasl_md4(lex_ctxt * lexic)
- {
-@@ -192,12 +196,12 @@
- return retc;
- }
-
--
-+#ifdef HAVE_OPENSSL_MD2_H
- tree_cell * nasl_hmac_md2(lex_ctxt * lexic)
- {
- return nasl_hmac(lexic, EVP_md2());
- }
--
-+#endif
-
- tree_cell * nasl_hmac_md5(lex_ctxt * lexic)
- {
diff --git a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild b/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
deleted file mode 100644
index 497332220f40..000000000000
--- a/net-analyzer/libnasl/libnasl-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (libnasl)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="static-libs"
-
-RDEPEND="
- ~net-analyzer/nessus-libraries-${PV}
-"
-DEPEND="
- ${RDEPEND}
- sys-devel/bison
-"
-
-S=${WORKDIR}/${PN}
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${P}-openssl-1.patch \
- "${FILESDIR}"/${P}-gentoo.patch \
- "${FILESDIR}"/${P}-bison3.patch
-
- sed \
- -e "/^LDFLAGS/s:$:${LDFLAGS}:g" \
- -i nasl.tmpl.in || die
-
- tc-export CC
-}
-
-src_configure() {
- econf \
- $(use_enable static-libs static) \
- --enable-shared
-}
-
-src_compile() {
- # emake fails for >= -j2. bug #16471.
- emake -C nasl cflags
- emake
-}
-
-src_install() {
- default
- prune_libtool_files
-}
diff --git a/net-analyzer/libnasl/metadata.xml b/net-analyzer/libnasl/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/libnasl/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
-
-
diff --git a/net-analyzer/nessus-client/Manifest b/net-analyzer/nessus-client/Manifest
deleted file mode 100644
index 6878254d4fa2..000000000000
--- a/net-analyzer/nessus-client/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST NessusClient-1.0.2.tar.gz 2058324 BLAKE2B 8e2d27bc2c88d57bb57088d6061119144282db547d3f21bb242c9ba20e7f091fdbae3ee26f21ab4b8c33b8a3ff901c311e77ecb2d28aecf3d066152db2d2efcc SHA512 999e8ba11208351ffc37bad9fabc8c0b01e4abc2a638660818a1877cdb21a5d3b40d330b722debe9833e87db60e4f8aef53044f14fe5eeb8ffe57f3522bfa927
-DIST nessus-client.png.bz2 10043 BLAKE2B 471dabb9effab168d6a92595a258679e961e8e1a64c29aa4b0ff0d013b67bf5b417d764390eddfff6bd9bdae0f385d1858890ec97dfbffa2f1d45b26e40c7dc3 SHA512 39e2b41e3b4fcfdace80085c917754fb0a4cfebcf1f684d97e36e5212e8e2e3539f10527909d7e4e350afdc73801ac1fb5bff2bb5c12be4770e2bb27487542af
diff --git a/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch b/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
deleted file mode 100644
index a233449b14ad..000000000000
--- a/net-analyzer/nessus-client/files/nessus-client-1.0.2-make.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- a/Makefile 2006-12-23 15:27:39.000000000 +0100
-+++ b/Makefile 2010-08-23 01:12:51.000000000 +0200
-@@ -2,8 +2,10 @@
-
- ALLDEPS = nessus.tmpl
-
--all: libnessus-client client sslstuff
--
-+all:
-+ $(MAKE) -C libnessus
-+ $(MAKE) -C nessus
-+ $(MAKE) -C ssl
-
- nessus.tmpl: nessus.tmpl.in configure VERSION
- $(SHELL) configure $(CONFIGURE_ARGS)
-@@ -21,20 +23,17 @@
- $(INSTALL) -m $(CLIENTMODE) nessusclient-mkcert $(DESTDIR)${bindir}
- $(INSTALL) -m $(CLIENTMODE) ssl/nessusclient-mkrand $(DESTDIR)${bindir}
-
--sslstuff:
-- cd ssl && $(MAKE)
--
- install-man:
- @echo installing man pages ...
- @test -d $(DESTDIR)${mandir}/man1 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man1
- @test -d $(DESTDIR)${mandir}/man8 || $(INSTALL_DIR) $(DESTDIR)${mandir}/man8
- @test -d $(DESTDIR)${datadir}/doc/ || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/
-- @test -d $(DESTDIR)${datadir}/doc/NessusClient || $(INSTALL_DIR) $(DESTDIR)${datadir}/doc/NessusClient
-+ @test -d $(NESSUS_DOCDIR) || $(INSTALL_DIR) $(NESSUS_DOCDIR)
-
- $(INSTALL) -c -m 0444 ${MAN_NESSUS_1} $(DESTDIR)${mandir}/man1/NessusClient.1
- $(INSTALL) -c -m 0444 doc/nessusclient-mkcert.1 $(DESTDIR)${mandir}/man1/nessusclient-mkcert.1
- $(INSTALL) -c -m 0444 doc/nessusclient-mkrand.1 $(DESTDIR)${mandir}/man1/nessusclient-mkrand.1
-- $(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(DESTDIR)${datadir}/doc/NessusClient/NessusClient_UserGuide.pdf
-+ $(INSTALL) -c -m 0444 doc/NessusClient_UserGuide.pdf $(NESSUS_DOCDIR)/NessusClient_UserGuide.pdf
-
- win32: ${MAN_NESSUS_1}
- $(MANROFF) ${MAN_NESSUS_1} > doc/NessusClient.1.cat
-@@ -45,23 +44,15 @@
- @echo ' --------------------------------------------------------------'
- @echo
-
--client-install : client
-+client-install : nessus
- test -d $(DESTDIR)${bindir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${bindir}
- $(INSTALL) -m $(CLIENTMODE) ${make_bindir}/NessusClient $(DESTDIR)${bindir}
-
--client :
-- cd nessus && $(MAKE)
--
--libnessus-client:
-- cd libnessus && $(MAKE)
--
--
- doc : $(MAN_NESSUS_1)
-
- $(MAN_NESSUS_1) : $(MAN_NESSUS_1).in
- @sed -e 's?@NESSUSD_CONFDIR@?${NESSUSD_CONFDIR}?g;s?@NESSUSD_DATADIR@?${NESSUSD_DATADIR}?g;s?@NESSUSD_PLUGINS@?${NESSUSD_PLUGINS}?g;' $(MAN_NESSUS_1).in >$(MAN_NESSUS_1)
-
--
- clean:
- cd nessus && $(MAKE) clean
- cd libnessus && $(MAKE) clean
---- a/ssl/Makefile 2006-09-12 23:41:31.000000000 +0200
-+++ b/ssl/Makefile 2010-08-23 01:16:51.000000000 +0200
-@@ -6,7 +6,7 @@
- all : nessusclient-mkrand
-
- nessusclient-mkrand: $(OBJS)
-- $(CC) $(OBJS) -o nessusclient-mkrand -lm
-+ $(CC) $(LDFLAGS) $(OBJS) -o nessusclient-mkrand -lm
-
- nessusclient-mkrand.o: nessusclient-mkrand.c
- $(CC) $(CFLAGS) -c nessusclient-mkrand.c
diff --git a/net-analyzer/nessus-client/metadata.xml b/net-analyzer/nessus-client/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/nessus-client/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
-
-
diff --git a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild b/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
deleted file mode 100644
index f7bdb5234055..000000000000
--- a/net-analyzer/nessus-client/nessus-client-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils toolchain-funcs
-
-MY_PN=NessusClient
-MY_P=${MY_PN}-${PV}
-
-DESCRIPTION="A client for the Nessus vulnerability scanner"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="mirror://gentoo/${MY_P}.tar.gz
- mirror://gentoo/nessus-client.png.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="libressl doc"
-
-RDEPEND="!net-analyzer/nessus-core
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- >=x11-libs/gtk+-2.8.8:2"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- doc? ( app-text/htmldoc )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-make.patch
- sed -i \
- -e "/NESSUS_DOCDIR/s|/doc/NessusClient|/doc/${PF}|g" \
- nessus.tmpl.in || die
-}
-
-src_configure() {
- tc-export CC
- econf
-}
-
-src_install() {
- emake DESTDIR="${D}" install || die
- dodoc CHANGES README_SSL VERSION
-
- doicon "${WORKDIR}"/${PN}.png
- make_desktop_entry NessusClient "Nessus Client" nessus-client "Network"
-}
-
-pkg_postinst() {
- if ! use doc; then
- elog "If you do not have documentation installed, nessus-client"
- elog "will complain. To install documentation, please emerge with"
- elog "the doc useflag set. Beware that it will emerge app-text/htmldoc,"
- elog "a big package."
- fi
-}
diff --git a/net-analyzer/nessus-core/Manifest b/net-analyzer/nessus-core/Manifest
deleted file mode 100644
index 0d533c0ee7f7..000000000000
--- a/net-analyzer/nessus-core/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nessus-core-2.2.9.tar.gz 674390 BLAKE2B 76599f5a6521d7f2a38d75c647eeaa4faa5d5482803ea1cf21ae0ffbe37f7d638f03c1710b65f5a442af55ccf5eea07385393c34761549441afee6e466b4eadd SHA512 7ec7f35a2b407126d174b6015e7d9566535892d64c5ea4d05297fbf93493016a885ca15c9102abfd515422b49fcd23585e7d41537a4f1afc0b6278c28690fcb1
diff --git a/net-analyzer/nessus-core/files/2.2.9-crash.patch b/net-analyzer/nessus-core/files/2.2.9-crash.patch
deleted file mode 100644
index d95c28404de2..000000000000
--- a/net-analyzer/nessus-core/files/2.2.9-crash.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- nessus-core/nessus/auth.c 2007-08-31 23:12:36.000000000 +0200
-+++ nessus-core/nessus/auth.c 2007-08-31 23:12:52.000000000 +0200
-@@ -92,11 +92,11 @@
- char * buffer = emalloc(s);
- int len, n = 0;
- signal(SIGPIPE, sighand_pipe);
-- va_start(param, data);
-
-
- for(;;)
- {
-+ va_start(param, data);
- r = vsnprintf(buffer, s - 1, data, param);
- if(r >= 0 && r < s)break;
- s = r > s ? r + 2 : s * 2;
diff --git a/net-analyzer/nessus-core/files/2.2.9-gentoo.patch b/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
deleted file mode 100644
index c97f6979340d..000000000000
--- a/net-analyzer/nessus-core/files/2.2.9-gentoo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- Makefile | 10 +++++-----
- nessus-fetch/Makefile | 2 +-
- ssl/Makefile | 2 +-
- 3 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index b1485b3..382900a 100644
---- a/Makefile
-+++ b/Makefile
-@@ -86,17 +86,17 @@ client-install : client
- $(INSTALL) -m $(CLIENTMODE) ${make_bindir}/nessus $(DESTDIR)${bindir}
-
- client :
-- cd nessus && $(MAKE)
-+ $(MAKE) -C nessus
-
--server :
-- cd nessusd && $(MAKE)
-+server : client
-+ $(MAKE) -C nessusd
-
- sslstuff :
-- cd ssl && $(MAKE)
-+ $(MAKE) -C ssl
-
-
- fetchtool:
-- cd nessus-fetch && $(MAKE)
-+ $(MAKE) -C nessus-fetch
-
-
- doc : $(MAN_NESSUS_1) $(MAN_NESSUSD_8)
-diff --git a/nessus-fetch/Makefile b/nessus-fetch/Makefile
-index 63439bc..89fd8c9 100644
---- a/nessus-fetch/Makefile
-+++ b/nessus-fetch/Makefile
-@@ -5,7 +5,7 @@ include ../nessus.tmpl
- all: nessus-fetch
-
- nessus-fetch: nessus-fetch.o
-- $(CC) nessus-fetch.o -o nessus-fetch $(LIBS)
-+ $(CC) $(LDFLAGS) nessus-fetch.o -o nessus-fetch $(LIBS)
-
- nessus-fetch.o: nessus-fetch.c
- $(CC) $(NESSUS_CFLAGS) ${include} $(DEFS) $(NESSUS_DEFS) -c nessus-fetch.c
-diff --git a/ssl/Makefile b/ssl/Makefile
-index 738a692..5e51426 100644
---- a/ssl/Makefile
-+++ b/ssl/Makefile
-@@ -6,7 +6,7 @@ OBJS = nessus-mkrand.o
- all : nessus-mkrand
-
- nessus-mkrand: $(OBJS)
-- $(CC) $(OBJS) -o nessus-mkrand -lm
-+ $(CC) $(LDFLAGS) $(OBJS) -o nessus-mkrand -lm
-
- nessus-mkrand.o: nessus-mkrand.c
- $(CC) $(CFLAGS) -c nessus-mkrand.c
diff --git a/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch b/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
deleted file mode 100644
index fe60ede62b29..000000000000
--- a/net-analyzer/nessus-core/files/nessus-core-2.2.9-open.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- nessus-core/nessusd/detached.c.orig
-+++ nessus-core/nessusd/detached.c
-@@ -408,7 +408,7 @@
- char * target;
- {
- char * fname = detached_fname(globals);
-- int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC);
-+ int f = open(fname, O_CREAT|O_WRONLY|O_TRUNC, 0600);
- if(f >= 0)
- {
- write(f, target, strlen(target));
diff --git a/net-analyzer/nessus-core/files/nessusd-r7 b/net-analyzer/nessus-core/files/nessusd-r7
deleted file mode 100644
index e19296b01b9b..000000000000
--- a/net-analyzer/nessus-core/files/nessusd-r7
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2004 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-depend() {
- need net
-}
-
-start() {
- ebegin "Starting nessusd"
- start-stop-daemon --start --quiet --exec /usr/sbin/nessusd -- -D
- eend $?
-}
-
-stop() {
- ebegin "Stop nessusd"
- start-stop-daemon --stop --quiet --exec /usr/sbin/nessusd
- einfo "Waiting for the environment to be sane"
- while [ -n "$RUNNING" ] ; do
- sleep 1
- RUNNING=$(ps aux | grep -m 1 nessusd: | grep -v grep)
- done
- sleep 3
- eend $?
-}
diff --git a/net-analyzer/nessus-core/metadata.xml b/net-analyzer/nessus-core/metadata.xml
deleted file mode 100644
index 3907d4a0d0e6..000000000000
--- a/net-analyzer/nessus-core/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
-
-A remote security scanner for Linux (nessus-core)
-
diff --git a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild b/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
deleted file mode 100644
index 695ef1f31909..000000000000
--- a/net-analyzer/nessus-core/nessus-core-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit toolchain-funcs eutils autotools
-
-DESCRIPTION="A remote security scanner for Linux (nessus-core)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="debug gtk prelude tcpd"
-
-RDEPEND="
- ~net-analyzer/nessus-libraries-${PV}
- ~net-analyzer/libnasl-${PV}
- tcpd? ( sys-apps/tcp-wrappers )
- gtk? ( x11-libs/gtk+:2 )
- prelude? ( dev-libs/libprelude )
- !net-analyzer/nessus-client"
-DEPEND="${RDEPEND}
- virtual/pkgconfig"
-
-S="${WORKDIR}"/${PN}
-
-DOCS="README* UPGRADE_README CHANGES doc/*.txt doc/ntp/*"
-
-src_prepare() {
- tc-export CC
- epatch \
- "${FILESDIR}"/${PV}-gentoo.patch \
- "${FILESDIR}"/${PV}-crash.patch \
- "${FILESDIR}"/${P}-open.patch
-
- sed -i -e "/^LDFLAGS/s:$:${LDFLAGS}:g" nessus.tmpl.in || die
- sed -i -e 's:CFLAGS="-g"; ::' configure.in || die
-
- eautoreconf
-}
-
-src_configure() {
- econf \
- $(use_enable tcpd tcpwrappers) \
- $(use_enable debug) \
- $(use_enable gtk)
-}
-
-src_compile() {
- emake -C nessus cflags
- emake -C nessusd cflags
- default
-}
-
-src_install() {
- default
- newinitd "${FILESDIR}"/nessusd-r7 nessusd
- keepdir /var/lib/nessus/logs
- keepdir /var/lib/nessus/users
- # newer version is provided by nessus-libraries
- # should be fixed upstream in version 2.2.6
- rm "${ED}"/usr/include/nessus/includes.h
-}
diff --git a/net-analyzer/nessus-libraries/Manifest b/net-analyzer/nessus-libraries/Manifest
deleted file mode 100644
index f3fcb0f9da44..000000000000
--- a/net-analyzer/nessus-libraries/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nessus-libraries-2.2.9.tar.gz 426560 BLAKE2B 0ad26fa0cccbe9229b0f02d9a2d4000895fd04a3f37cbccf9562e7dc852364b5ba71c4f3ab70dae69c6326ef243879ebb771679cc6c7fccf5e500824df32de1f SHA512 4a87ad07cde5ca82d673efbe2b2d951231880533bc30be4b265ea1f81fba39ae90ef150293486e8bba227a1c174e89cde6e8f95b60f2250f7c2c9ae910d52cff
diff --git a/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch b/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
deleted file mode 100644
index 41cd2b21c938..000000000000
--- a/net-analyzer/nessus-libraries/files/nessus-libraries-2.2.9-linking.patch
+++ /dev/null
@@ -1,61 +0,0 @@
- Makefile | 4 ++--
- libhosts_gatherer/Makefile | 2 +-
- libnessus/Makefile | 4 ++--
- libnessus/kb.c | 1 +
- 4 files changed, 6 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 938d1b2..672d8cf 100644
---- a/Makefile
-+++ b/Makefile
-@@ -3,8 +3,8 @@ include nessus.tmpl
- ALLDEPS = nessus.tmpl nessus-config
-
- all: $(ALLDEPS) $(PCAP_MAKE)
-- cd libnessus && ${MAKE}
-- cd libhosts_gatherer && ${MAKE}
-+ ${MAKE} -C libnessus
-+ ${MAKE} -C libhosts_gatherer
-
- nessus-config: nessus-config.pre Makefile nessus.tmpl
- @echo Creating $@ ...
-diff --git a/libhosts_gatherer/Makefile b/libhosts_gatherer/Makefile
-index e2a647c..7d628d8 100644
---- a/libhosts_gatherer/Makefile
-+++ b/libhosts_gatherer/Makefile
-@@ -22,7 +22,7 @@ install : libhosts_gatherer.la
- $(LIBTOOL) --finish $(DESTDIR)${libdir}
-
- libhosts_gatherer.la : $(OBJS)
-- $(LIBTOOL) $(CC) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
-+ $(LIBTOOL) $(CC) $(LDFLAGS) -o libhosts_gatherer.la $(LO_OBJS) -rpath ${libdir} \
- -version-info ${PACKAGE_VERSION}
-
- hg_utils.o : hg_utils.h hosts_gatherer.h hg_utils.c
-diff --git a/libnessus/Makefile b/libnessus/Makefile
-index c5a96db..211f57a 100644
---- a/libnessus/Makefile
-+++ b/libnessus/Makefile
-@@ -100,8 +100,8 @@ kb.o: kb.c
- snprintf.o : snprintf.c
- $(LIBTOOL) $(CC) $(CIPHER) $(DEFS) $(INCLUDE) $(CFLAGS) -c snprintf.c
- libnessus.la: $(OBJS)
-- $(LIBTOOL) $(CC) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
-- -version-info ${PACKAGE_VERSION}
-+ $(LIBTOOL) $(CC) $(LDFLAGS) -o libnessus.la $(LO_OBJS) -rpath ${libdir} \
-+ -version-info ${PACKAGE_VERSION} `pcap-config --libs` `pkg-config --libs openssl`
-
- install : libnessus.la
- test -d $(DESTDIR)${libdir} || $(INSTALL_DIR) -m 755 $(DESTDIR)${libdir}
-diff --git a/libnessus/kb.c b/libnessus/kb.c
-index 921c1a1..cbfd840 100644
---- a/libnessus/kb.c
-+++ b/libnessus/kb.c
-@@ -20,6 +20,7 @@
- */
-
- #include
-+#include
- #define HASH_MAX 65537
-
-
diff --git a/net-analyzer/nessus-libraries/metadata.xml b/net-analyzer/nessus-libraries/metadata.xml
deleted file mode 100644
index 41f809fbde83..000000000000
--- a/net-analyzer/nessus-libraries/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
-
-A remote security scanner for Linux (nessus-libraries)
-
diff --git a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild b/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
deleted file mode 100644
index 5b4734740551..000000000000
--- a/net-analyzer/nessus-libraries/nessus-libraries-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (nessus-libraries)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~amd64-linux"
-IUSE="crypt debug libressl static-libs"
-
-# Hard dep on SSL since libnasl won't compile when this package is emerged -ssl.
-DEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- net-libs/libpcap"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
- epatch "${FILESDIR}"/${P}-linking.patch
-
- sed -i -e "s:^\(LDFLAGS=\):\1 ${LDFLAGS}:g" nessus.tmpl.in || die
- sed -i -e '/sbindir/d' Makefile || die
-}
-
-src_configure() {
- tc-export CC
- econf \
- $(use_enable crypt cypher) \
- $(use_enable debug) \
- $(use_enable debug debug-ssl) \
- $(use_enable static-libs static) \
- --enable-shared \
- --with-ssl="${EPREFIX}/usr/$(get_libdir)" \
- --disable-nessuspcap
-}
-
-src_install() {
- default
- use static-libs || find "${ED}" -name '*.la' -delete
-}
diff --git a/net-analyzer/nessus-plugins/Manifest b/net-analyzer/nessus-plugins/Manifest
deleted file mode 100644
index e8810678711b..000000000000
--- a/net-analyzer/nessus-plugins/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST nessus-plugins-GPL-2.2.9.tar.gz 1064740 BLAKE2B 347559036c5054f0b6a890b41f9fba27cb44be5a4885e5d6e3594241006b9723037297d9af82c78844305bc8b46573e81d7bc6bed137ee1044cff47cb877cb37 SHA512 b76a77be29409bca00fb014ae8e35878283e5d8adccef570da08b65df760f46438ef0392c4435366831b4bc456715f7af9c0ad5e20dd5554f1e4b8c9e8791b04
diff --git a/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch b/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
deleted file mode 100644
index 39366844382f..000000000000
--- a/net-analyzer/nessus-plugins/files/2.2.9-gentoo.patch
+++ /dev/null
@@ -1,58 +0,0 @@
- plugins/find_service/Makefile | 2 +-
- plugins/nessus_tcp_scanner/Makefile | 2 +-
- plugins/ssl_ciphers/Makefile | 2 +-
- plugins/synscan/Makefile | 2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/plugins/find_service/Makefile b/plugins/find_service/Makefile
-index f4fd8e3..12e62a3 100644
---- a/plugins/find_service/Makefile
-+++ b/plugins/find_service/Makefile
-@@ -5,7 +5,7 @@ PLUGNAME=find_service
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c
- $(LIBTOOL) $(CC) $(DEFS) $(include) -c $(PLUGNAME).c
-- $(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
-+ $(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
- -rpath $(rootdir)/bin/plugins
- ../install_plug $(PLUGNAME) $(rootdir)
- clean :
-diff --git a/plugins/nessus_tcp_scanner/Makefile b/plugins/nessus_tcp_scanner/Makefile
-index 8cf6c6d..7a27495 100644
---- a/plugins/nessus_tcp_scanner/Makefile
-+++ b/plugins/nessus_tcp_scanner/Makefile
-@@ -8,7 +8,7 @@ PLUGNAME=nessus_tcp_scanner
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c
- $(LIBTOOL) $(CC) $(DEFS) $(include) -c $(PLUGNAME).c
-- $(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
-+ $(LIBTOOL) $(CC) $(LDFLAGS) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) -lm $(LIBUTIL) \
- -rpath $(rootdir)/bin/plugins
- ../install_plug $(PLUGNAME) $(rootdir)
- clean :
-diff --git a/plugins/ssl_ciphers/Makefile b/plugins/ssl_ciphers/Makefile
-index dc10e64..1747745 100644
---- a/plugins/ssl_ciphers/Makefile
-+++ b/plugins/ssl_ciphers/Makefile
-@@ -5,7 +5,7 @@ PLUGNAME=ssl_ciphers
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c
- $(LIBTOOL) $(CC) $(DEFS) $(include) -c $(PLUGNAME).c
-- $(LIBTOOL) $(CC) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
-+ $(LIBTOOL) $(CC) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
- -rpath $(rootdir)/bin/plugins
- ../install_plug $(PLUGNAME) $(rootdir)
- clean :
-diff --git a/plugins/synscan/Makefile b/plugins/synscan/Makefile
-index 16aefa1..c434b92 100644
---- a/plugins/synscan/Makefile
-+++ b/plugins/synscan/Makefile
-@@ -5,7 +5,7 @@ PLUGNAME=synscan
- all : $(PLUGNAME).nes
- $(PLUGNAME).nes : $(PLUGNAME).c
- $(LIBTOOL) $(CC) $(DEFS) $(include) -c $(PLUGNAME).c
-- $(LIBTOOL) $(CC) $(DEFS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
-+ $(LIBTOOL) $(CC) $(DEFS) $(LDFLAGS) -o lib$(PLUGNAME).la $(PLUGNAME).lo $(LIBS) \
- -rpath $(rootdir)/bin/plugins
- ../install_plug $(PLUGNAME) $(rootdir)
- clean :
diff --git a/net-analyzer/nessus-plugins/metadata.xml b/net-analyzer/nessus-plugins/metadata.xml
deleted file mode 100644
index 3c5a6082eb8f..000000000000
--- a/net-analyzer/nessus-plugins/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
-
-A remote security scanner for Linux (nessus-plugins)
-
diff --git a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild b/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
deleted file mode 100644
index 1bf4d4933b7a..000000000000
--- a/net-analyzer/nessus-plugins/nessus-plugins-2.2.9-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="A remote security scanner for Linux (nessus-plugins)"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI="ftp://ftp.nessus.org/pub/nessus/nessus-${PV}/src/nessus-plugins-GPL-${PV}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="libressl"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- ~net-analyzer/nessus-core-${PV}
- ~net-analyzer/nessus-libraries-${PV}
- net-libs/libpcap"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}"/${PN}
-
-src_prepare() {
- tc-export CC
- epatch "${FILESDIR}"/${PV}-gentoo.patch
-}
-
-src_install() {
- default
- dodoc docs/*.txt
-}
diff --git a/net-analyzer/nessus/Manifest b/net-analyzer/nessus/Manifest
deleted file mode 100644
index e69de29bb2d1..000000000000
diff --git a/net-analyzer/nessus/metadata.xml b/net-analyzer/nessus/metadata.xml
deleted file mode 100644
index 74c2baebb4ec..000000000000
--- a/net-analyzer/nessus/metadata.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-
-
-
-
- netmon@gentoo.org
- Gentoo network monitoring and analysis project
-
-
diff --git a/net-analyzer/nessus/nessus-2.2.9.ebuild b/net-analyzer/nessus/nessus-2.2.9.ebuild
deleted file mode 100644
index eb724b7270e2..000000000000
--- a/net-analyzer/nessus/nessus-2.2.9.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=0
-
-DESCRIPTION="A remote security scanner"
-HOMEPAGE="http://www.nessus.org/"
-SRC_URI=""
-
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
- ~net-analyzer/nessus-libraries-${PV}
- ~net-analyzer/libnasl-${PV}
- ~net-analyzer/nessus-core-${PV}
- ~net-analyzer/nessus-plugins-${PV}"
-
-pkg_postinst() {
- elog "The following article may be useful to get started:"
- elog "http://www.securityfocus.com/infocus/1741"
-}
-
-pkg_postrm() {
- elog "Note: this is a META ebuild for ${P}."
- elog "to remove it completely or before re-emerging"
- elog "either use 'depclean', or remove/re-emerge these packages:"
- elog
- for dep in ${RDEPEND}; do
- elog " ${dep}"
- done
- echo
-}
diff --git a/net-analyzer/prelude-nessus/Manifest b/net-analyzer/prelude-nessus/Manifest
deleted file mode 100644
index 56b8d053c764..000000000000
--- a/net-analyzer/prelude-nessus/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prelude-correlation-20021107.tar.bz2 7613 BLAKE2B d943bf569af306647a527b40e455813bb13da09c1c2b46006a42c76d05facddd7073e995fda59246d1773f36598acda272cd6c11fe0ee05ac1e0c5f8282c46f5 SHA512 2dcc1d038d9385bef8082476fccce768a47f04eac7c687d684739cd837b9e02f4514bb6296ad98ecc17d0208ec7c39d7401de5abd212ef403b349a76faa0ee79
diff --git a/net-analyzer/prelude-nessus/metadata.xml b/net-analyzer/prelude-nessus/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-analyzer/prelude-nessus/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild b/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
deleted file mode 100644
index d16e50a2ba17..000000000000
--- a/net-analyzer/prelude-nessus/prelude-nessus-20021107.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-DESCRIPTION="Nessus Correlation support for Prelude-IDS"
-HOMEPAGE="http://www.rstack.org/oudot/prelude/correlation/"
-
-MY_P="${P/nessus/correlation}"
-
-SRC_URI="mirror://gentoo/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc x86"
-IUSE=""
-
-DEPEND="dev-lang/perl"
-
-S=${WORKDIR}/${MY_P}
-
-src_install() {
- dobin *.pl
- dodoc CORRELATION_README EXAMPLES NEWS vuln.conf_example
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 52e140470699..70c604438ceb 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/libupnpp/libupnpp-0.16.1.ebuild b/net-libs/libupnpp/libupnpp-0.16.1.ebuild
index a9708d584ec7..86d95189100c 100644
--- a/net-libs/libupnpp/libupnpp-0.16.1.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.16.1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="http://www.lesbonscomptes.com/upmpdcli"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/net-libs/libupnpp/libupnpp-0.17.0.ebuild b/net-libs/libupnpp/libupnpp-0.17.0.ebuild
index 3806b746ec9c..cdc9273992ba 100644
--- a/net-libs/libupnpp/libupnpp-0.17.0.ebuild
+++ b/net-libs/libupnpp/libupnpp-0.17.0.ebuild
@@ -3,7 +3,7 @@
EAPI=7
DESCRIPTION="The libupnpp C++ library wraps libupnp for easier use by upmpdcli and upplay"
-HOMEPAGE="http://www.lesbonscomptes.com/upmpdcli"
+HOMEPAGE="https://www.lesbonscomptes.com/upmpdcli"
SRC_URI="https://www.lesbonscomptes.com/upmpdcli/downloads/${P}.tar.gz"
LICENSE="GPL-2"
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index d790349a2e62..cf27d83f03aa 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 353a810ca3bb..76e47b904e9c 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -5,6 +5,6 @@ DIST haproxy-1.7.11.tar.gz 1752129 BLAKE2B 1947ab837f6b81761eec931e97c7349462561
DIST haproxy-1.8.13.tar.gz 2063046 BLAKE2B 9ebccf2520719cdf209bc9a87bf28d015b5b673e0d017d5387af4025f930ac401f6a2cfa851583ffe6b6645b7b91ad255bb5db737688a1f310958072a11c8a80 SHA512 54d4cb0721a3868267d7e085b3d3bb050384e4279eb49e88abb925bb3ea8cc39ef9069bdc99b7b18a23fd22e0d29e24dfcb8a0507ddca9243a845e4418be9cc5
DIST haproxy-1.8.18.tar.gz 2080500 BLAKE2B fcc51fbe6c496dbf99e49add4b582ec9357c94daebaea6396e131b4e6f323fdcc11d40039b9de9b6e2762c46863a1efd5062524df3d42991eef73ae3a42a9787 SHA512 7bcdc8fd110bb77fa3b1f735474218fb766b7701b87e939249697cb780aedf039b3d8f59cbfb5fa271473ad789df4ac60a64cbb6c61330e1125a13676ad25fc0
DIST haproxy-1.8.19.tar.gz 2080757 BLAKE2B 46a97620f3b5c3f205e8b9d6e49acca8e107a1e6918ac18c036b9c3408666348400f8d9f6f4a4103e7f206c6373b25a224536c0969e2dad1013c2320b07b0ced SHA512 f62b0a18f19295986d26c5c60b6b1ad55850a175bed67a359282cc37a4c630a0c2be51d608226b4316f2e69c3008c20a1cb91ce10f86311219355973a050e65b
-DIST haproxy-1.8.8.tar.gz 2054534 BLAKE2B 5eabd37dfb79783dc20425cbb16ca1e1afed23861f66c9e8a738dd56d9ca35b3ceb2604c308543ca99222aa867e11ff613fc09012669882a4bdaaff03cb76450 SHA512 8310f84b364348600273c295a3b315a79cba1f782b86b47d8d47b3ffd1e6fb62fd278c4f2dfa185d0a269f73c1067695a763733736877989a941162b625462a1
DIST haproxy-1.8.9.tar.gz 2057051 BLAKE2B d81d18f68a27ae8a77660c1ecb1dfc28599263ebfd57f25ea574af2b101b35eb7a1a89ba4034b55dfa89673ae6ac4c0dca5428b4b494a02184b1b157850ce96b SHA512 e59c29af3a39d6212f012ae8341b169436e10e42fadaf8f1aa68d2bb7ee181fd1fe3b74640bfcd8c37c17dfc5062b36bd69d90290d7c59cd3e4648ef2ab1c8dd
DIST haproxy-1.9.4.tar.gz 2357935 BLAKE2B 761118da39742eff07e3bc2772a9318a6aaddbeb706e684afa619a11e4a6f1e91f35212b22b58474334621daaec160a4f9183a65698343a4fbb64d9cb38ad049 SHA512 804baeb0493bfaedce59f04a5c7eedd703aec11fbfc9744c6d3f642e3200a5fccbfc92d9da9555a2b266534b9cd5bb81308c57c7627512b951e5a83cb1b24cb0
+DIST haproxy-1.9.6.tar.gz 2363063 BLAKE2B b3ccf1b7f9d82144b42f2ee5db7b4367a380d3d8d14145ed097b5329831fb9c9454023c04c3e542d9591e377f5f9c4e0630801414ce44b950b99718a971d88af SHA512 3b823005f02d035435838689ddbf50c4fd9fc14af20450c413526cda7a29eb01ee01f68d6867545ebf966235688eedeeb3d00f5e6011727486d53e881d8e73b6
diff --git a/net-proxy/haproxy/haproxy-1.8.8.ebuild b/net-proxy/haproxy/haproxy-1.9.6.ebuild
similarity index 95%
rename from net-proxy/haproxy/haproxy-1.8.8.ebuild
rename to net-proxy/haproxy/haproxy-1.9.6.ebuild
index 44131da836d2..2212a12930ac 100644
--- a/net-proxy/haproxy/haproxy-1.8.8.ebuild
+++ b/net-proxy/haproxy/haproxy-1.9.6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI="6"
@@ -74,6 +74,7 @@ pkg_setup() {
src_compile() {
local -a args=(
+ V=1
TARGET=linux2628
USE_GETADDRINFO=1
USE_TFO=1
@@ -102,8 +103,9 @@ src_compile() {
if use tools ; then
for contrib in ${CONTRIBS[@]} ; do
+ # Those two includes are a workaround for hpack Makefile missing those
emake -C contrib/${contrib} \
- CFLAGS="${CFLAGS}" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
+ CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC=$(tc-getCC) ${args[@]}
done
fi
}
diff --git a/net-vpn/Manifest.gz b/net-vpn/Manifest.gz
index e638ea015a78..4f7d85e5b58a 100644
Binary files a/net-vpn/Manifest.gz and b/net-vpn/Manifest.gz differ
diff --git a/net-vpn/tinc/Manifest b/net-vpn/tinc/Manifest
index e161801b3993..3c00a622ed51 100644
--- a/net-vpn/tinc/Manifest
+++ b/net-vpn/tinc/Manifest
@@ -1,5 +1,4 @@
-DIST tinc-1.0.35-upstream-patches-0.tar.xz 2884 BLAKE2B a01ee1a372cc366402c005a48adccd7e31bd3182c1fc6df2dc27aecd622266be06f2c25aa169794b2970fe1f8218b7fa813365f8852e165ed2356ed885c5fde3 SHA512 c95add88e05dc7dc8d09618dd07870e400e1fe28c8f864acbf131d9616d75337fd1d2d7b44ee80c3f31e1b713f258bb9d575956114e73fea781488d2b477a5f5
+DIST tinc-1.0.35-upstream-patches-1.tar.xz 6028 BLAKE2B d236125211efda0c8b5aa4e93a278fec17d57ecb257ea057ca67f2a465d1da7d069f6d3a97220dc1e40123266bc2fc68685d2ea2e143033a12199278b073c31b SHA512 8ae2b96d5f296bc5d0d21fa814832ccafdb5595b06d60d72a090eadb4aade9e386990801b5e1a8cca722f88881aa2d21e70f9154570feede6a9771a0eaec83ab
DIST tinc-1.0.35.tar.gz 499277 BLAKE2B 419b581167614d534b6f2f3b804657f088c013529d7738766aff199da775860ffed42ecb61e8ed008c5b6fa410f071e2fe1ca59f0c6e443c0a8017cd10c31ce3 SHA512 037867306c21506d57d69d35c0f246b2936022047978fa3e01464b5f6b65f109760507d9cc740f82f8166f39c5ce44d9f8dde55655a6372dacd5b5974aeaee32
DIST tinc-1.1-upstream-patches-2.tar.xz 23500 BLAKE2B ab44d2efcd494c6a49e9e0bc109670a586b087d5ce1daab9b9cdf8f50a4c9b9d927e102fe947e75e6f7be509ba9315936315006b557b39639399bc7f40109f5f SHA512 351537f212421e7fe28fcf97293550edaa4c4c8a578bf4eeca34ae591caefb222df4d5d96bfa03bddd6afcb5143e68b59f5341b2a6412c053a3cecf4fdd0bee8
-DIST tinc-1.1pre16.tar.gz 703679 BLAKE2B c02636f52983c1fdebe28058a5e49f3952ac10b238c9d8f01a10b140960803f197a057c883860ca259b949883c406cf74f518d0e45bf84f10566a964570daf9b SHA512 b32a0a734a4c8a91bad4cef4177cb45757c97c09dc179da1e3357f2fde48b3b0747587dbac31ecb5400e1553b6712d474a6a1808ac24bce1a3494c1842bb6c43
DIST tinc-1.1pre17.tar.gz 927313 BLAKE2B d16789b64f6d11deda4752fdeeb603fe62efd6b1d68b0286fbe9c329d8ea51494df59e0e5bf1564b25a0ed44e9244799eb61f73de9ded6a1a418417453adddc4 SHA512 b966dbfa522e12ff6766c4deb54a9da29cddc15c3a1df0f0e084df27ee5f1421ffbebc0e29472b1bcd79ea8b41f8c0ef904172e333dcba0b85bafe4654a63b30
diff --git a/net-vpn/tinc/tinc-1.0.35-r1.ebuild b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
similarity index 98%
rename from net-vpn/tinc/tinc-1.0.35-r1.ebuild
rename to net-vpn/tinc/tinc-1.0.35-r2.ebuild
index 1f2d089df011..7f3390de4c16 100644
--- a/net-vpn/tinc/tinc-1.0.35-r1.ebuild
+++ b/net-vpn/tinc/tinc-1.0.35-r2.ebuild
@@ -7,7 +7,7 @@ inherit systemd
DESCRIPTION="tinc is an easy to configure VPN implementation"
HOMEPAGE="http://www.tinc-vpn.org/"
-UPSTREAM_VER=0
+UPSTREAM_VER=1
[[ -n ${UPSTREAM_VER} ]] && \
UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${P}-upstream-patches-${UPSTREAM_VER}.tar.xz"
diff --git a/net-vpn/tinc/tinc-1.0.35.ebuild b/net-vpn/tinc/tinc-1.0.35.ebuild
deleted file mode 100644
index 8d387dbc59c8..000000000000
--- a/net-vpn/tinc/tinc-1.0.35.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-SRC_URI="http://www.tinc-vpn.org/packages/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="libressl +lzo uml vde +zlib"
-
-DEPEND="
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- lzo? ( dev-libs/lzo:2 )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- vde? ( net-misc/vde )"
-
-src_configure() {
- econf \
- --enable-jumbograms \
- --disable-tunemu \
- $(use_enable lzo) \
- $(use_enable uml) \
- $(use_enable vde) \
- $(use_enable zlib)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodir /etc/tinc
- dodoc AUTHORS NEWS README THANKS
- doconfd "${FILESDIR}"/tinc.networks
- newconfd "${FILESDIR}"/tincd.conf tincd
- newinitd "${FILESDIR}"/tincd-r1 tincd
- systemd_newunit "${FILESDIR}"/tincd_at.service "tincd@.service"
-}
diff --git a/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild b/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
deleted file mode 100644
index f252a1217c30..000000000000
--- a/net-vpn/tinc/tinc-1.1_pre16-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-MY_PV=${PV/_/}
-MY_P=${PN}-${MY_PV}
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-single-r1 systemd
-
-DESCRIPTION="tinc is an easy to configure VPN implementation"
-HOMEPAGE="http://www.tinc-vpn.org/"
-
-# UPSTREAM_VER=1
-
-[[ -n ${UPSTREAM_VER} ]] && \
- UPSTREAM_PATCHSET_URI="https://dev.gentoo.org/~dlan/distfiles/${PN}-1.1-upstream-patches-${UPSTREAM_VER}.tar.xz"
-
-SRC_URI="http://www.tinc-vpn.org/packages/${MY_P}.tar.gz
- ${UPSTREAM_PATCHSET_URI}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos"
-IUSE="+lzo +ncurses libressl +readline +ssl uml vde upnp +zlib"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- ssl? (
- !libressl? ( dev-libs/openssl:0= )
- libressl? ( dev-libs/libressl:0= )
- )
- lzo? ( dev-libs/lzo:2 )
- ncurses? ( sys-libs/ncurses:= )
- readline? ( sys-libs/readline:= )
- upnp? ( net-libs/miniupnpc )
- zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}
- vde? ( net-misc/vde )"
-S="${WORKDIR}/${MY_P}"
-
-# Upstream's patchset
-if [[ -n ${UPSTREAM_VER} ]]; then
- PATCHES=( "${WORKDIR}"/patches-upstream )
-fi
-
-PATCHES+=(
- "${FILESDIR}"/${PF}-fix-paths.patch #560528
- "${FILESDIR}"/${PN}-1.1-tinfo.patch #621868
-)
-
-src_prepare() {
- default
- eautoreconf
-
- # Fix the static (failing UNKNOWN) version in the autoconf
- # NOTE: When updating the ebuild, make sure to check that this
- # line number hasn't changed in the upstream sources.
- sed -i "6d" configure.ac
- sed -i "6iAC_INIT([tinc], ${PVR})" configure.ac
-}
-
-src_configure() {
- econf \
- --enable-jumbograms \
- --disable-silent-rules \
- --enable-legacy-protocol \
- --disable-tunemu \
- --with-systemd="$(systemd_get_systemunitdir)" \
- $(use_enable lzo) \
- $(use_enable ncurses curses) \
- $(use_enable readline) \
- $(use_enable uml) \
- $(use_enable vde) \
- $(use_enable zlib) \
- $(use_enable upnp miniupnpc) \
- $(use_with ssl openssl)
- #--without-libgcrypt \
-}
-
-src_install() {
- emake DESTDIR="${D}" install
- dodir /etc/tinc
- dodoc AUTHORS NEWS README THANKS
- doconfd "${FILESDIR}"/tinc.networks
- newconfd "${FILESDIR}"/tincd.conf tincd
- newinitd "${FILESDIR}"/tincd-r2 tincd
-}
-
-pkg_postinst() {
- elog "This package requires the tun/tap kernel device."
- elog "Look at http://www.tinc-vpn.org/ for how to configure tinc"
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 23eab2b9e8e2..17fa61c8c4b2 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64-fbsd/package.use.mask b/profiles/arch/amd64-fbsd/package.use.mask
index 97ca81bb3800..0fe76cb080db 100644
--- a/profiles/arch/amd64-fbsd/package.use.mask
+++ b/profiles/arch/amd64-fbsd/package.use.mask
@@ -1,6 +1,11 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
+# Lars Wendler (15 Apr 2019)
+# dev-vcs/subversion lacks amd64-fbsd keyword
+app-portage/layman subversion
+dev-vcs/git subversion
+
# David Seifert (15 Apr 2019)
# app-arch/zstd is not keyworded.
dev-libs/boost zstd
diff --git a/profiles/license_groups b/profiles/license_groups
index 77c279f8dc2d..52fbcec2d6a8 100644
--- a/profiles/license_groups
+++ b/profiles/license_groups
@@ -30,7 +30,7 @@ OSI-APPROVED AFL-3.0 AGPL-3 AGPL-3+ Apache-1.1 Apache-2.0 APL-1.0 APSL-2 Artisti
# Licenses in this list should NOT appear directly or indirectly in
# @FSF-APPROVED or @OSI-APPROVED.
# Note: Licenses for fonts should be included in @MISC-FREE-DOCS.
-MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libpng libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
+MISC-FREE ACE Allegro alternate AMPAS bea.ri.jsr173 BEER-WARE boehm-gc BSD-1 BSD-with-attribution buddy bufexplorer.vim BZIP2 canfep CAOSL CDDL-Schily CeCILL-C CMake CPL-0.5 CRACKLIB Crypt-IDEA DES docbook dom4j eGenixPublic-1.1 ElementTree Emacs ErlPL-1.1 FastCGI feh File-MMagic Flashpix FLEX flexmock FLTK freetts FVWM gd gsm HTML-Tidy htmlc iASL icu IDPL imagemagick Info-ZIP inner-net ipadic ipx-utils Ispell JasPer2.0 JDOM JNIC JOVE keynote LambdaMOO LIBGLOSS libmng libpng libpng2 libtiff LLVM-Grant LPPL-1.3 LPPL-1.3b lsof Mail-Sendmail mapm-4.9.5 matplotlib Mini-XML minpack MIT-with-advertising mm mpich2 NCSA-HDF netcat NEWLIB ngrep Old-MIT openafs-krb5-a Openwall otter PCRE perforce photopc PHP-2.02 pngcrush pngnq Princeton psutils qmail-nelson rc rdisc regexp-UofT repoze RSA rwpng scanlogd Sendmail Sendmail-Open-Source shrimp SMAIL Snd SNIA SSLeay Subversion SVFL symlinks tablelist tcltk tcp_wrappers_license telegram TeX TeX-other-free the-Click-license Time-Format Time-modules tm-align torque-2.5 totd Toyoda UCAR-Unidata URT VTK w3m wxWinLL-3.1 x2x xbatt xboing XC Xdebug xtrs xvt YaTeX yuuji ZSH
# Metaset for all free software
FREE-SOFTWARE @FSF-APPROVED @OSI-APPROVED @MISC-FREE
@@ -71,7 +71,7 @@ BINARY-REDISTRIBUTABLE @FREE bh-luxi Broadcom Dina intel-ucode ipw2100-fw ipw220
# License agreements that try to take away your rights. These are more
# restrictive than "all-rights-reserved" or require explicit approval.
-EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs Sourcetrail SPS StarUML-EULA Steam supermicro teamspeak3 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
+EULA AdobeFlash-11.x AMD-GPU-PRO-EULA AnyDesk-TOS ArxFatalis-EULA-JoWooD baudline BCS bf1942-lnxded CAPYBARA-EULA Coherent-Graphics CROSSOVER-2 DOOM3 ETQW f.lux FAH-EULA-2014 FraunhoferFDK GameFront Gameplay-Group-EULA geekbench genymotion GIMPS GOG-EULA google-chrome Google-TOS Intel-SDP Introversion LastPass LOKI-EULA LRCTF MakeMKV-EULA Mendeley-terms Microsemi Mojang MTA-0.5 NVIDIA-CODEC-SDK NVIDIA-CUDA OPERA-12 OPERA-2014 Oracle-BCLA-JavaSE PAPERS-PLEASE POMPOM postal2 Primate-Plunge protonmail-bridge-EULA PUEL Q3AEULA Q3AEULA-20000111 QUAKE4 Quartus-prime-megacore RAR RTCW RTCW-ETEULA RuneScape-EULA SJ-Labs Sourcetrail SPS Steam supermicro teamspeak3 TeamViewer THINKTANKS TIK ubiquiti ut2003 ut2003-demo Vivaldi worklog-assistant zi-labone
# Local Variables:
# mode: conf-space
diff --git a/profiles/package.mask b/profiles/package.mask
index 20d2dfc77ced..5c22345265f4 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -669,78 +669,6 @@ x11-drivers/xf86-video-trident
x11-drivers/xf86-video-tseng
x11-drivers/xf86-video-voodoo
-# Michał Górny (16 Mar 2019)
-# The current Gentoo version of Nessus is from 2006 (!). It does
-# not build for quite some time (#590226), also -client fails with new
-# openssl (#674424). Upstream has stopped releasing non-proprietary
-# versions. While at it, remove prelude-nessus that practically
-# has not been touched since 2003. net-analyzer/openvas is a suggested
-# open source replacement; net-analyzer/nessus-bin provides (outdated)
-# proprietary versions of Nessus.
-# Removal in 30 days. Bug #680636.
-net-analyzer/libnasl
-net-analyzer/nessus
-net-analyzer/nessus-client
-net-analyzer/nessus-core
-net-analyzer/nessus-libraries
-net-analyzer/nessus-plugins
-net-analyzer/prelude-nessus
-sec-policy/selinux-nessus
-
-# Michał Górny (16 Mar 2019)
-# MayaVi requires Python 2, at the same time depending on IPython
-# which removed Python 2 support. The current Gentoo version is
-# from 2016 and has not been bumped. It fails with various versions
-# of sci-libs/vtk (#624082, #663152).
-#
-# ETS is a suite of NIH packages that have no reverse dependencies
-# except for MayaVi and Py2.7 support in recently added
-# dev-python/construct. The packages were added without a dedicated
-# maintainer and were incidentally updated since. Some of them have
-# various unsolved issues including segfaults (#654090), bundled
-# libraries (#450466), semi-broken ebuilds (#678042).
-#
-# Removal in 30 days. Bug #672412.
-dev-python/apptools
-dev-python/blockcanvas
-dev-python/chaco
-dev-python/codetools
-dev-python/enable
-dev-python/enaml
-dev-python/encore
-dev-python/envisage
-dev-python/ets
-dev-python/etsdevtools
-dev-python/etsproxy
-dev-python/graphcanvas
-dev-python/pyface
-dev-python/scimath
-=dev-python/traits-4.5.0
-=dev-python/traits-4.6.0
-dev-python/traitsui
-sci-visualization/mayavi
-
-# Michał Górny (16 Mar 2019)
-# ProDy was added in 2015 and not bumped since (with upstream making
-# frequent releases). The primary maintainer abandoned it. The Gentoo
-# version requires Python 2, while it depends on IPython which dropped
-# support for Python 2.
-#
-# pymol-plugins-dynamics is its only revdep, added and abandoned
-# by the primary maintainer about the same time as ProDy. Last bumped
-# in 2017, making it behind upstream.
-#
-# Removal in 30 days. Bug #672410.
-sci-chemistry/prody
-sci-chemistry/pymol-plugins-dynamics
-
-# Michał Górny (16 Mar 2019)
-# Major browsers stopped supporting NPAPI plugins a while ago.
-# Furthermore, modern browsers carry built-in multimedia support,
-# rendering media plugins redundant. Last release in 2014.
-# Removal in 30 days. Bug #671854.
-www-plugins/mozplugger
-
# Eray Aslan (01 Mar 2019)
# Mask experimental software
=mail-mta/postfix-3.5*
diff --git a/sci-chemistry/Manifest.gz b/sci-chemistry/Manifest.gz
index 7eedd16905fe..ddb0834212b1 100644
Binary files a/sci-chemistry/Manifest.gz and b/sci-chemistry/Manifest.gz differ
diff --git a/sci-chemistry/prody/Manifest b/sci-chemistry/prody/Manifest
deleted file mode 100644
index 58a196622277..000000000000
--- a/sci-chemistry/prody/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST prody-1.6.tar.gz 5333629 BLAKE2B 73d268d0e717ff1e53be73da31e313aca8d4ccb2633f5bc8a43124b68f4945685c3edafc885998f58d7114363485e0b7a1e4882d35be134babc081cd4e1e1f86 SHA512 d913ad45b034f1b0e7e36428a6f8f199b365b94bd85bee5ade8eb9eb2b04a18c93d894a2abd18b3a1342597725ffbf96f8ce8a49191fc27e5608f3d2c9a3c49a
diff --git a/sci-chemistry/prody/metadata.xml b/sci-chemistry/prody/metadata.xml
deleted file mode 100644
index d798ea1d6cdf..000000000000
--- a/sci-chemistry/prody/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- sci-chemistry@gentoo.org
- Gentoo Chemistry Project
-
-
- prody/ProDy
-
-
diff --git a/sci-chemistry/prody/prody-1.6.ebuild b/sci-chemistry/prody/prody-1.6.ebuild
deleted file mode 100644
index abab32d7927e..000000000000
--- a/sci-chemistry/prody/prody-1.6.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="Protein Dynamics Analysis"
-HOMEPAGE="http://prody.csb.pitt.edu/ https://github.com/prody/ProDy"
-SRC_URI="https://github.com/prody/ProDy/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="test"
-
-RDEPEND="
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/matplotlib[${PYTHON_USEDEP}]
- >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
- dev-python/pyparsing[${PYTHON_USEDEP}]
- sci-biology/biopython[${PYTHON_USEDEP}]
- sci-libs/scipy[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-S="${WORKDIR}"/ProDy-${PV}
-
-DISTUTILS_IN_SOURCE_BUILD=true
-
-python_prepare_all() {
- emake remove
- distutils-r1_python_prepare_all
-}
-
-python_test() {
- cd "${BUILD_DIR}" || die
- PATH="${S}"/scripts:${PATH} \
- nosetests --verbose || die
-}
diff --git a/sci-chemistry/pymol-plugins-dynamics/Manifest b/sci-chemistry/pymol-plugins-dynamics/Manifest
deleted file mode 100644
index ea60811a63b5..000000000000
--- a/sci-chemistry/pymol-plugins-dynamics/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST pymol-plugins-dynamics-2.0.7.tar.gz 822680 BLAKE2B 3c8b3418dff65d9cad4f632b5062f13626bdf267190a9b11a96d63fec345532eed4d54014f5caf2c62a7d6e86705fb667f42bba378aa8ba0dab19c6bcd212984 SHA512 0d57e3e90a86a59cb96b11371ff1227b2b3e8f5b82cce713f4a855d6e7f5a10524508d4cb4dad7d9f77562fc1753b1af3c9240d4333e0189dabeef07c40d78a1
-DIST pymol-plugins-dynamics-2.1.1.tar.gz 816623 BLAKE2B bd065b176f3f779962c4f48e715a74afefbac2ee6dd31bb9f52208fae171f16847ff70692a7df3739dbaa23be215f73e4fe265328b05c4fb3dd598def48c9ff1 SHA512 e872c131e7d4ae37bd0e33e56d5d51e83ad732a125a46802ad9fa08648906d49de166bf75fbeca1431726aa9df781671c29578a799f580a94dc1fd89fb398b3c
diff --git a/sci-chemistry/pymol-plugins-dynamics/metadata.xml b/sci-chemistry/pymol-plugins-dynamics/metadata.xml
deleted file mode 100644
index d0be20ea989c..000000000000
--- a/sci-chemistry/pymol-plugins-dynamics/metadata.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-
-
-
-
- sci-chemistry@gentoo.org
- Gentoo Chemistry Project
-
-
- tomaszmakarewicz/Dynamics
-
-
diff --git a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.7.ebuild b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.7.ebuild
deleted file mode 100644
index a860012cf6ff..000000000000
--- a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.0.7.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-MY_PN="Dynamics"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Molecular dynamics in Pymol"
-HOMEPAGE="https://github.com/tomaszmakarewicz/Dynamics"
-SRC_URI="https://github.com/tomaszmakarewicz/Dynamics/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- sci-chemistry/prody[${PYTHON_USEDEP}]
- "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( manual.odt )
-
-src_install() {
- python_moduleinto pmg_tk/startup
- python_foreach_impl python_domodule pymol_plugin_dynamics.py
-}
diff --git a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.1.1.ebuild b/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.1.1.ebuild
deleted file mode 100644
index a860012cf6ff..000000000000
--- a/sci-chemistry/pymol-plugins-dynamics/pymol-plugins-dynamics-2.1.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-r1
-
-MY_PN="Dynamics"
-MY_P="${MY_PN}-${PV}"
-
-DESCRIPTION="Molecular dynamics in Pymol"
-HOMEPAGE="https://github.com/tomaszmakarewicz/Dynamics"
-SRC_URI="https://github.com/tomaszmakarewicz/Dynamics/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
- ${PYTHON_DEPS}
- sci-chemistry/prody[${PYTHON_USEDEP}]
- "
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}"/${MY_P}
-
-DOCS=( manual.odt )
-
-src_install() {
- python_moduleinto pmg_tk/startup
- python_foreach_impl python_domodule pymol_plugin_dynamics.py
-}
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 8f9d1104cd6c..ee0d6b16b2ee 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/mayavi/Manifest b/sci-visualization/mayavi/Manifest
deleted file mode 100644
index 5cf74e3bda4d..000000000000
--- a/sci-visualization/mayavi/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST mayavi-4.3.0.tar.gz 7669453 BLAKE2B d64fec70ff0763ad7534b2e20b699b53ba9eb9fc345e484ee045c04961846b3f22d2a8cb05baed2f132a58dd4cf101ace67741ae53bc9dcd8e08f3809a07006e SHA512 1530c194ba5f94d7a2767dbc0e704892520c24c2af5ea8977c791922fa8a1ddf780d1589bf38b4efe4b5bc779c1ef6358d9664963fa9d4c5a1e75f6500f4a974
-DIST mayavi-4.5.0.tar.gz 8966895 BLAKE2B 19e43b23c47c1b3f41edc797db4afa255bcdc595569927c9b1ebd269c1ed1ea18ff24ee7a8895f759bb8fb70134faebdd798aa5bb6c7990db141f3f1b1a0d5cf SHA512 241faa5b39a6b1b28f04bf6fff44d3ff952b2df581b03845224d9404c3b1a71b2985c23060b6a50425545106a0e32f474956dba7f5b9dfcfb4d55e866a3acee6
diff --git a/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch b/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch
deleted file mode 100644
index 1cdb129871e3..000000000000
--- a/sci-visualization/mayavi/files/mayavi-4.2.0-doc.patch
+++ /dev/null
@@ -1,37 +0,0 @@
- setup.py | 16 ++++++++--------
- 1 file changed, 8 insertions(+), 8 deletions(-)
-
-diff --git a/setup.py b/setup.py
-index 0177c44..58d13b0 100644
---- a/setup.py
-+++ b/setup.py
-@@ -300,14 +300,14 @@ class MyBuild(build.build):
- """
-
- def run(self):
-- build_tvtk_classes_zip()
-+# build_tvtk_classes_zip()
- build.build.run(self)
-- self.run_command('gen_docs')
-- try:
-- self.run_command('build_docs')
-- except:
-- log.warn("Couldn't build documentation:\n%s" %
-- traceback.format_exception(*sys.exc_info()))
-+# self.run_command('gen_docs')
-+# try:
-+# self.run_command('build_docs')
-+# except:
-+# log.warn("Couldn't build documentation:\n%s" %
-+# traceback.format_exception(*sys.exc_info()))
-
-
-
-@@ -494,6 +494,6 @@ numpy.distutils.core.setup(
- license = "BSD",
- long_description = '\n'.join(DOCLINES[3:]),
- platforms = ["Windows", "Linux", "Mac OS-X", "Unix", "Solaris"],
-- zip_safe = False,
-+ zip_safe = True,
- **config
- )
diff --git a/sci-visualization/mayavi/mayavi-4.3.0.ebuild b/sci-visualization/mayavi/mayavi-4.3.0.ebuild
deleted file mode 100644
index 9492d357897f..000000000000
--- a/sci-visualization/mayavi/mayavi-4.3.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
-HOMEPAGE="
- http://code.enthought.com/projects/mayavi/
- https://pypi.org/project/mayavi/"
-SRC_URI="http://www.enthought.com/repo/ets/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
- >=dev-python/apptools-4[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- >=dev-python/envisage-4[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyface[${PYTHON_USEDEP}]
- >=dev-python/traitsui-4[${PYTHON_USEDEP}]
- dev-python/wxpython[${PYTHON_USEDEP}]"
-CDEPEND="sci-libs/vtk[python]"
-DEPEND="
- ${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/wxpython[opengl]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-#DOCS="docs/*.txt"
-
-# testsuite is a trainwreck; https://github.com/enthought/mayavi/issues/66
-#RESTRICT="test"
-
-PATCHES=( "${FILESDIR}"/${PN}-4.2.0-doc.patch )
-
-python_compile_all() {
- if use doc; then
- ${PYTHON} setup.py gen_docs || die
- ${PYTHON} setup.py build_docs || die
- fi
-}
-
-python_test() {
-
- VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
- distutils-r1_python_install_all
- use doc && dohtml -r docs/build/mayavi/html/
-
- if use examples; then
- docompress -x usr/share/doc/${PF}/examples/
- insinto /usr/share/doc/${PF}
- doins -r examples
- fi
-
- newicon mayavi/core/ui/images/m2.png mayavi2.png
- make_desktop_entry ${PN}2 \
- "Mayavi2 2D/3D Scientific Visualization" ${PN}2
-}
diff --git a/sci-visualization/mayavi/mayavi-4.5.0.ebuild b/sci-visualization/mayavi/mayavi-4.5.0.ebuild
deleted file mode 100644
index fc00ab86acb6..000000000000
--- a/sci-visualization/mayavi/mayavi-4.5.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Enthought Tool Suite: Scientific data 3-dimensional visualizer"
-HOMEPAGE="
- http://code.enthought.com/projects/mayavi/
- https://pypi.org/project/mayavi/"
-SRC_URI="https://github.com/enthought/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="2"
-KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples test"
-
-RDEPEND="
- >=dev-python/apptools-4[${PYTHON_USEDEP}]
- dev-python/configobj[${PYTHON_USEDEP}]
- >=dev-python/envisage-4[${PYTHON_USEDEP}]
- dev-python/ipython[${PYTHON_USEDEP}]
- dev-python/numpy[${PYTHON_USEDEP}]
- dev-python/pyface[${PYTHON_USEDEP}]
- >=dev-python/traitsui-4[${PYTHON_USEDEP}]
- dev-python/wxpython:*[opengl,${PYTHON_USEDEP}]"
-CDEPEND="sci-libs/vtk[python,rendering]"
-DEPEND="
- ${CDEPEND}
- dev-python/setuptools[${PYTHON_USEDEP}]
- doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
- test? (
- ${RDEPEND}
- dev-python/nose[${PYTHON_USEDEP}]
- dev-python/wxpython[opengl]
- media-fonts/font-cursor-misc
- media-fonts/font-misc-misc
- )"
-
-# testsuite is a trainwreck; https://github.com/enthought/mayavi/issues/66
-#RESTRICT="test"
-
-# not sure if this is still needed
-#PATCHES=( "${FILESDIR}"/${PN}-4.2.0-doc.patch )
-
-python_compile_all() {
- if use doc; then
- esetup.py gen_docs
- esetup.py build_docs
- fi
-}
-
-python_test() {
- VIRTUALX_COMMAND="nosetests" virtualmake
-}
-
-python_install_all() {
- use examples && EXAMPLES=( examples/. )
- use doc && HTML_DOCS=( docs/build/mayavi/html/. )
- distutils-r1_python_install_all
-
- newicon mayavi/core/ui/images/m2.png mayavi2.png
- make_desktop_entry ${PN}2 \
- "Mayavi2 2D/3D Scientific Visualization" ${PN}2
-}
diff --git a/sci-visualization/mayavi/metadata.xml b/sci-visualization/mayavi/metadata.xml
deleted file mode 100644
index f169ae16ecd3..000000000000
--- a/sci-visualization/mayavi/metadata.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-
-
-
-
- sci@gentoo.org
- Gentoo Science Project
-
-
- Mayavi2 is a general purpose, cross-platform tool for 3-D scientific
- data visualization. Its features include:
- * Visualization of scalar, vector and tensor data in 2 and 3 dimensions.
- * Easy scriptability using Python.
- * Easy extendibility via custom sources, modules, and data filters.
- * Reading several file formats: VTK (legacy and XML), PLOT3D, etc.
- * Saving of visualizations.
- * Saving rendered visualization in a variety of image formats.
- * Convenient functionality for rapid scientific plotting via mlab
-
- Mayavi2 has been designed with scriptability and extensibility in
- mind. Mayavi2 provides a mayavi2 application which is usable by
- itself. However, Mayavi2 may also be used as a plotting engine, in
- scripts, like with matplotlib or gnuplot, as well as a library for
- interactive visualizations in any other application. It may also be
- used as an Envisage plug-in which allows it to be embedded in other
- Envisage based applications natively.
-
-
diff --git a/sec-policy/Manifest.gz b/sec-policy/Manifest.gz
index 6d23b9f9f2af..fc7418609cd7 100644
Binary files a/sec-policy/Manifest.gz and b/sec-policy/Manifest.gz differ
diff --git a/sec-policy/selinux-nessus/Manifest b/sec-policy/selinux-nessus/Manifest
deleted file mode 100644
index f74352d949be..000000000000
--- a/sec-policy/selinux-nessus/Manifest
+++ /dev/null
@@ -1,9 +0,0 @@
-DIST patchbundle-selinux-base-policy-2.20180114-r1.tar.bz2 285245 BLAKE2B 32ff8fa3330aa1e17d6a2fc3c267e9c66d5f540fe4b7d1da8961cdc8e3c4a86e157db66e144c9cef13d52b85aa8a242e89ccf6e9c3ef455a7133bc448586d70f SHA512 5d5ce77b42e183d0b0241567bbe718622ab388cf9538193730c999da832f3ea7e4e9306f2b96cfbcfad01e6fcc834cf1d43b7b388a5a50242dd7f5ef3e252b42
-DIST patchbundle-selinux-base-policy-2.20180114-r2.tar.bz2 293604 BLAKE2B 4b301021a646431fe3a4431815ef66231e3436c7c5a4b02c4d52492a603ab58b54bfdbd589161779c4331f26f56ef6eac4c6f7d8dbc489410e41f7e3cedecff7 SHA512 bfb8e0fc852bc91c38ecdfb51823f5fa89f7e9021eae108648fa8b574cf8303d28cb74b0a6b6c0745576113e419e1f232131c3166a6da9b431aebd3de642f75d
-DIST patchbundle-selinux-base-policy-2.20180114-r3.tar.bz2 302345 BLAKE2B b175c5564b44aa4256018e25fbe8ec1bf16bdb0b6a01486bd7afbc5c6332b555838838759fea4859f767211097748bb5e62139264b2f4b792b2dec854d3b7031 SHA512 1586857f6403527470a19e534217805e19460695a854c3630fda80b26cd8e1e5d6f1a327c6d56b3ffa7260858d0c1ae393ea427e9ac0239163e914edc97f1c07
-DIST patchbundle-selinux-base-policy-2.20180701-r1.tar.bz2 315378 BLAKE2B eeeb0b04c023c40289b6d964aefd1773d2b5d6912f1dffebf9509e6dcdbb39b17e722ee4483fb2b11193d4b987a85f90c7dc7e61cef3cf982fc2ba368d4900ef SHA512 a8b049120f1c420f9bfb55aba9ed0157ff7896ace402cd1b77b01d1ea52b67e49d915f1c00de83ff4d59b1cf8b8aa1f39b50ba312d842ed4850e75fcc7f5be42
-DIST patchbundle-selinux-base-policy-2.20180701-r2.tar.bz2 320881 BLAKE2B 12382c64ff8d2acef97ae50b0285061b7f018df0d94034670696b6f19003ee9c9c4f66c711e744696e47145857fcbd577a7762fa807921b40a5366e473901687 SHA512 29453f9deb90b7f982d5a6a3161d79a8171d58d20c0e0de523347d4f1296ad3d4ed970ada0823692e8def4f21756d727628bd919802ec2b1c39087ce5d0811b0
-DIST patchbundle-selinux-base-policy-2.20190201-r1.tar.bz2 426390 BLAKE2B 33e05e03e1e087f0bf460930f074108af5fa05688f7681ba3545530d21174be7d29e9035a7bc37e9acdbe3468680891f9865ad83188eb0f8fb9b9012252d6a1e SHA512 f2855a340f4ae7ba6c4cf0ec9445de7ca20f9fc0f11783992340ca2f073bbbf2d4999190f46f3910213dd1555e9578b3609284af6a7712b401053216c004ff7e
-DIST refpolicy-2.20180114.tar.bz2 743725 BLAKE2B f64fc08dd68033a1762e147a0f205d8d1b71853017cefe4252ca4ca67029d457f28d81a82ae4e78c01e6c2131e9329d0e5634afee12fb4b291685e7563d59107 SHA512 9acb15d1d84670b25d1fc310e048348f707aa22ea184828e677946817aeb6ee2c590233195ead13aa91c7096544d6d29dfb6e98297120ef9464fc6107ffc9ce7
-DIST refpolicy-2.20180701.tar.bz2 753050 BLAKE2B 7069a1b9b9bef25950e62bb50ac09f4a9d5ef6fd0acc667d321da396c3935939348534458df129f7bc81687dca240b4c4fc120d1f46d452665d335c9f023da8c SHA512 9dd5a1e10da5d25fea96cc25efb682f8ac866e835a1d940b161c1ce944cac9a90a5836b03c14311acad6bf9acd9a78003f36e050d35d8edb43606575523857b5
-DIST refpolicy-2.20190201.tar.bz2 552750 BLAKE2B d3cbdf5c5f8480cd36173d8cfbd2f55a6ad4a9f2176883dcc19eece6059114ca8700d07f8bd318d0430da253bb9e4e6a6e03f7a7db8a7964c95b00452aaab040 SHA512 c6568b679ad1a7c5c566b55291e86ce3784ee609c0091e5d465d41055724d950180780c7eedb3413351101b9182db51c7bce1816db1a9a17b3257861363efc6e
diff --git a/sec-policy/selinux-nessus/metadata.xml b/sec-policy/selinux-nessus/metadata.xml
deleted file mode 100644
index 23348151b5e5..000000000000
--- a/sec-policy/selinux-nessus/metadata.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-
-
-
-
- selinux@gentoo.org
- SELinux Team
-
- Gentoo SELinux policy for nessus
-
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r1.ebuild
deleted file mode 100644
index a25c49771254..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r2.ebuild
deleted file mode 100644
index a25c49771254..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r3.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r3.ebuild
deleted file mode 100644
index e3e8e63caa48..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20180114-r3.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild
deleted file mode 100644
index a25c49771254..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="amd64 -arm ~arm64 ~mips x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r2.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r2.ebuild
deleted file mode 100644
index a81d10f015af..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20180701-r2.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-2.20190201-r1.ebuild b/sec-policy/selinux-nessus/selinux-nessus-2.20190201-r1.ebuild
deleted file mode 100644
index a837f32a2ae3..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-2.20190201-r1.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild b/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
deleted file mode 100644
index e3e8e63caa48..000000000000
--- a/sec-policy/selinux-nessus/selinux-nessus-9999.ebuild
+++ /dev/null
@@ -1,15 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-IUSE=""
-MODS="nessus"
-
-inherit selinux-policy-2
-
-DESCRIPTION="SELinux policy for nessus"
-
-if [[ ${PV} != 9999* ]] ; then
- KEYWORDS="~amd64 -arm ~arm64 ~mips ~x86"
-fi
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index c744ab800c1d..fc3281d575ee 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/mozplugger/Manifest b/www-plugins/mozplugger/Manifest
deleted file mode 100644
index 6404b7319bbf..000000000000
--- a/www-plugins/mozplugger/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST mozplugger-2.1.6.tar.gz 153183 BLAKE2B 5ff998d6b5cdd205217b209d3fcc51055d837d80f824d8ea9883e575fd37567816beba52943bfbd157f5d7aa7132fec26b46b2fb9fa2608dd747125a2a42e531 SHA512 4585986de5ee7eb66c168e784606ac273197d5d8f8ebfe683c9eb63de2c4457f2f5403dc140555a6a262ff3abfd194e58ac5fa77a58f199c44d23f851b57612e
diff --git a/www-plugins/mozplugger/metadata.xml b/www-plugins/mozplugger/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/www-plugins/mozplugger/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
diff --git a/www-plugins/mozplugger/mozplugger-2.1.6.ebuild b/www-plugins/mozplugger/mozplugger-2.1.6.ebuild
deleted file mode 100644
index 19b987ebaae3..000000000000
--- a/www-plugins/mozplugger/mozplugger-2.1.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit toolchain-funcs
-
-DESCRIPTION="Streaming media plugin for Mozilla, based on netscape-plugger"
-HOMEPAGE="http://mozplugger.mozdev.org/"
-SRC_URI="http://${PN}.mozdev.org/files/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="x11-libs/libX11"
-DEPEND="${RDEPEND}"
-
-src_install() {
- dobin ${PN}-{helper,controller,linker,update}
-
- insinto /etc
- doins ${PN}rc
-
- insinto /usr/$(get_libdir)/nsbrowser/plugins
- doins ${PN}.so
-
- doman ${PN}.7
- dodoc ChangeLog README
-}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 3b1962d44367..9d087aa8982c 100644
Binary files a/xfce-extra/Manifest.gz and b/xfce-extra/Manifest.gz differ
diff --git a/xfce-extra/xfce4-windowck-plugin/Manifest b/xfce-extra/xfce4-windowck-plugin/Manifest
index 184a7f7426eb..385ad9e11b17 100644
--- a/xfce-extra/xfce4-windowck-plugin/Manifest
+++ b/xfce-extra/xfce4-windowck-plugin/Manifest
@@ -1,2 +1,3 @@
DIST xfce4-windowck-plugin-0.2.4.tar.gz 75442 BLAKE2B 76f8ecd19435a47f608af2478b4754cb8a3257a0943099cc0368c3320d9158d426255f3b20002819b1275bbb81b28737f00a0f603bc783e677e7b96cf73de09e SHA512 43798a8714926eb03b2f92f8dd813572030965133b672bd07c485da77efef96114ed412dc7a5de730b2bc21da561ca34c44147147c75f266d8bc393f2550557c
DIST xfce4-windowck-plugin-0.4.5.tar.gz 68762 BLAKE2B c4fdc900d16d668f06cc2c115c31df6d587ac7a833627b77145df4843497617a81acd508fbf5c54f9a443f4b2eaccf4ff86a445cbb83fbed068204c21f3354d2 SHA512 2750af17892e9083b0d359deb477688144b187b94dd0c8b50e4e88ed125631e7c6bf45a040cd036a9f09d1b8ce242a8d01a572eb9151258bb78c63e4744d367d
+DIST xfce4-windowck-plugin-0.4.6.tar.gz 67622 BLAKE2B 38a1ff76a75b3eb833be586bf93bc9bd73b7237e74cf06fd7540fef85befa4ef9ad8c8351d1d2bfad4af1f342c59b1cb0ebb94e50a3f5cc9c38c5fe9f0377d86 SHA512 a02f6f1b275484dc7ed08f3f9868af7a456c9f3b52bb893c2ac109a0ca8c4376e9d6d714f40d40c491531584486c8be3bebf3669f3186a143f6fcfe923b9f376
diff --git a/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild
new file mode 100644
index 000000000000..393b44fd9670
--- /dev/null
+++ b/xfce-extra/xfce4-windowck-plugin/xfce4-windowck-plugin-0.4.6.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7} )
+inherit autotools python-any-r1 xdg-utils
+
+DESCRIPTION="Xfce plugin puts the maximized window title and windows buttons on the panel"
+HOMEPAGE="https://github.com/cedl38/xfce4-windowck-plugin"
+SRC_URI="https://github.com/cedl38/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RDEPEND=">=x11-libs/gtk+-2.20:2
+ x11-libs/libX11
+ >=x11-libs/libwnck-2.30:1
+ >=xfce-base/libxfce4ui-4.10:=
+ >=xfce-base/libxfce4util-4.10:=
+ >=xfce-base/xfce4-panel-4.12:=
+ >=xfce-base/xfconf-4.10:="
+DEPEND="${RDEPEND}
+ ${PYTHON_DEPS}
+ dev-util/intltool
+ dev-util/xfce4-dev-tools
+ media-gfx/imagemagick[png]
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+src_prepare() {
+ # run xdt-autogen from xfce4-dev-tools added as dependency by EAUTORECONF=1 to
+ # rename configure.ac.in to configure.ac while grabbing $LINGUAS and $REVISION values
+ NOCONFIGURE=1 xdt-autogen || die
+
+ default
+}
+
+pkg_postinst() {
+ xdg_icon_cache_update
+}
+
+pkg_postrm() {
+ xdg_icon_cache_update
+}