diff --git a/app-admin/keepass/Manifest b/app-admin/keepass/Manifest
index 5a28563c23f8..c5f4400261aa 100644
--- a/app-admin/keepass/Manifest
+++ b/app-admin/keepass/Manifest
@@ -1 +1,2 @@
DIST KeePass-2.34-Source.zip 4744285 SHA256 e3f184e4deddd1aa5ee2b52e2373c772d3f3975e5eddb2fd729eb27b437011aa SHA512 a52fe7bb0cee60daa0428cf42cf2d6cfc5798fa52d535b10548880417bfe61458c5357ea3dfdb569571fa8aa958de05369c269e2dbb64af5cfa5c913fad521e0 WHIRLPOOL 2aeac242d5f1a342ec338cb442b8083f4dc72635d9bc8b02cd2aad4613ecf9f311cddf0832a3f1ebe03d881dce41d3a77edb097e3853967d467c2ce55b8d33cb
+DIST KeePass-2.35-Source.zip 4840873 SHA256 5faad9381af2f9d808d65ee3d880ff3bca9352c7ce886fea95d54f9169e863df SHA512 9f9bb0875c3261e004f655356e8302858afebb7d41a4e4619affaa5e8e5375ffe4fc2b251db10d1d18ef94e07d60dd9bd8812ecedcd5de4c4fbe641c6a37dede WHIRLPOOL db1d270ac5402021add60739ca4916d9dd81999c53b095d143a34a2886f47c354170e41fee63027be83866c541022c79c3c21111a501cd51bafb972e5fe277e2
diff --git a/app-admin/keepass/keepass-2.35.ebuild b/app-admin/keepass/keepass-2.35.ebuild
new file mode 100644
index 000000000000..f6ecc51e4332
--- /dev/null
+++ b/app-admin/keepass/keepass-2.35.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils fdo-mime gnome2-utils multilib
+
+MY_PN="KeePass"
+DESCRIPTION="A free, open source, light-weight and easy-to-use password manager"
+HOMEPAGE="http://keepass.info/"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-${PV}-Source.zip"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="aot"
+
+COMMON_DEPEND="dev-lang/mono"
+DEPEND="${COMMON_DEPEND}
+ app-arch/unzip"
+RDEPEND="${COMMON_DEPEND}
+ dev-dotnet/libgdiplus[cairo]"
+
+S="${WORKDIR}"
+PATCHES=( "${FILESDIR}/${PN}-2.20-xsl-path-detection.patch" )
+
+src_prepare() {
+ # KeePass looks for some XSL files in the same folder as the executable,
+ # we prefer to have it in /usr/share/KeePass. Apply patch using base function.
+ default
+
+ # Switch into build dir so the mono prepration script works correctly
+ cd Build || die
+ source PrepMonoDev.sh || die
+ cd ../ || die
+
+ # If we are using Mono 4 or newer, Then fix the build. Bug #558094
+ # https://sourceforge.net/p/keepass/discussion/329221/thread/72db1a65/
+ if has_version ">=dev-lang/mono-4" ; then
+ sed -i -e 's! ToolsVersion="3.5"!!g' Translation/TrlUtil/TrlUtil.csproj || die
+ sed -i -e 's/Format Version 10.00/Format Version 11.00/' KeePass.sln || die
+ fi
+}
+
+src_compile() {
+ # Build with Release target
+ xbuild /target:KeePass /property:Configuration=Release || die
+
+ # Run Ahead Of Time compiler on the binary
+ if use aot; then
+ cp Ext/KeePass.exe.config Build/KeePass/Release/ || die
+ mono --aot -O=all Build/KeePass/Release/KeePass.exe || die
+ fi
+}
+
+src_install() {
+ # Wrapper script to launch mono
+ make_wrapper "${PN}" "mono /usr/$(get_libdir)/${PN}/KeePass.exe"
+
+ # Some XSL files
+ insinto "/usr/share/${PN}/XSL"
+ doins Ext/XSL/*
+
+ insinto "/usr/$(get_libdir)/${PN}/"
+ exeinto "/usr/$(get_libdir)/${PN}/"
+
+ doins Ext/KeePass.exe.config
+
+ # Default configuration, simply says to use user-specific configuration
+ doins Ext/KeePass.config.xml
+
+ # The actual executable
+ doexe Build/KeePass/Release/KeePass.exe
+
+ # Copy the AOT compilation result
+ if use aot; then
+ doexe Build/KeePass/Release/KeePass.exe.so
+ fi
+
+ # Prepare the icons
+ newicon -s 256 Ext/Icons_04_CB/Finals/plockb.png "${PN}.png"
+ newicon -s 256 -t gnome -c mimetypes Ext/Icons_04_CB/Finals/plockb.png "application-x-${PN}2.png"
+
+ # Create a desktop entry and associate it with the KeePass mime type
+ make_desktop_entry "${PN}" "${MY_PN}" "${PN}" "System;Security" "MimeType=application/x-keepass2;"
+
+ # MIME descriptor for .kdbx files
+ insinto /usr/share/mime/packages/
+ doins "${FILESDIR}/${PN}.xml"
+
+ # sed, because patching this really sucks
+ sed -i 's/mono/mono --verify-all/g' "${D}/usr/bin/keepass"
+}
+
+pkg_preinst() {
+ gnome2_icon_savelist
+}
+
+pkg_postinst() {
+ _update_caches
+
+ if ! has_version x11-misc/xdotool ; then
+ elog "Optional dependencies:"
+ elog " x11-misc/xdotool (enables autotype/autofill)"
+ fi
+
+ elog "Some systems may experience issues with copy and paste operations."
+ elog "If you encounter this, please install x11-misc/xsel."
+}
+
+pkg_postrm() {
+ _update_caches
+}
+
+_update_caches() {
+ gnome2_icon_cache_update
+ fdo-mime_mime_database_update
+ fdo-mime_desktop_database_update
+}
diff --git a/app-admin/keepass/metadata.xml b/app-admin/keepass/metadata.xml
index 1bac3fa32dc3..9a5a02bfa730 100644
--- a/app-admin/keepass/metadata.xml
+++ b/app-admin/keepass/metadata.xml
@@ -9,6 +9,10 @@
kensington@gentoo.org
Proxy maintainer. CC him on bugs.
+
+ fearedbliss@gentoo.org
+ Proxy maintainer. CC him on bugs.
+
proxy-maint@gentoo.org
Proxy Maintainers
diff --git a/app-arch/bloscpack/Manifest b/app-arch/bloscpack/Manifest
index 00e0399ca743..d6e6b767b595 100644
--- a/app-arch/bloscpack/Manifest
+++ b/app-arch/bloscpack/Manifest
@@ -1,2 +1,3 @@
+DIST bloscpack-0.11.0.tar.gz 89839 SHA256 8c735ca961ca01141f741a23320d2acb7c1191863b26505bc8fc8e53110ac33b SHA512 68e6c05a4404fbb2554acc0a5a93500c5fe3eab4d91621ba0ffc290383873509d38fbb5b9c5733640a2cc58bf3c508067a411ba16e563dbd4e485f3036a5ebc7 WHIRLPOOL 96c4b0a751bae9dbbdd946d75551285c20ea9c54ca0715b5ba54f7929034e360befde076b1605660b6f93b8a76da800ef45e7f68a748efd7527caa303a8ce202
DIST bloscpack-0.5.0.tar.gz 45171 SHA256 9889ad1a79434de8adb49ad6a12c40ac542850e0a133ed1376cdbec27462f7f8 SHA512 3a3ab351e9ab77409b8f5774c4ede533e2393bf49065d52cb60018268f448d1cef5ba2b24d0d25ec86298f6ff55bbb9075af3b302558a0e2e7343344b002b8d1 WHIRLPOOL 1700d778fdc21f5b247d5ac97ea58e15511014cdbab666fb2691d483de9cbbe2c1aee5dc59bdb3a42c3859330b236ca817e62dbc81848a22e894fbb40d472afd
DIST bloscpack-0.6.0.tar.gz 60571 SHA256 a704bea04cae765e6f0be6e5b656803c6ead46ea4489c382dcd55cfd804a8aa0 SHA512 cd0b6e67d90fb8e320bfd5ddb41ee5d437543826f85931eb4cf3abbcb5eb6bc9581db88c2454b82b333ce2555f18670100f8df018299ce621eccd2e7c9e7d099 WHIRLPOOL aefb00c57e26cd90d23b9221c012a4ae3c821970782df4d2bebfc83ff6e0654ec1d91cf811a3969c33d4dd4e8ebcd6897fab1187f94ff1829f0a10aed64ef5cc
diff --git a/app-arch/bloscpack/bloscpack-0.11.0.ebuild b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
new file mode 100644
index 000000000000..b760f2f4d297
--- /dev/null
+++ b/app-arch/bloscpack/bloscpack-0.11.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Blosc compression"
+HOMEPAGE="https://github.com/Blosc/bloscpack"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="
+ dev-python/blosc[${PYTHON_USEDEP}]
+ dev-python/numpy[${PYTHON_USEDEP}]
+ dev-python/six[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? (
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/nose[${PYTHON_USEDEP}]
+ )
+"
+python_test() {
+ PYTHONPATH="${BUILD_DIR}"/lib nosetests -v || die
+}
diff --git a/app-arch/bloscpack/metadata.xml b/app-arch/bloscpack/metadata.xml
index 071ce698fc2d..5e17ecfaa28c 100644
--- a/app-arch/bloscpack/metadata.xml
+++ b/app-arch/bloscpack/metadata.xml
@@ -6,10 +6,10 @@
Gentoo Science Project
- Command line interface to and serialization format for Blosc, a high
- performance, multi-threaded, blocking and shuffling compressor. Uses
- python-blosc bindings to interface with blosc.
-
+ Command line interface to and serialization format for Blosc, a high
+ performance, multi-threaded, blocking and shuffling compressor. Uses
+ python-blosc bindings to interface with blosc.
+
bloscpack
Blosc/bloscpack
diff --git a/app-misc/i2bits/Manifest b/app-misc/i2bits/Manifest
new file mode 100644
index 000000000000..2f411c522133
--- /dev/null
+++ b/app-misc/i2bits/Manifest
@@ -0,0 +1 @@
+DIST i2bits-0.0.2.tar.gz 1751 SHA256 41237d4abcbd6af0806d1ac117604acbb51201c88fa5ec8ec1cb37233f60b99f SHA512 8dfca8513f8ad16ac5d093120d49f5d9d7acfd20cad0883c0533d2927aba0b6d779b1ad4d3575e7a66f0e56ead5f783e90f49208d6cc9c65bcb60c8558f5447c WHIRLPOOL 5b18b9cad7b472bb2c7a75eb490531f1438b8126adb87cae438a81bc8c3eef3a13ea01760efd044b86ff2ed5ba19a0d906ac5ec726a36290e9215aacb65c3946
diff --git a/app-misc/i2bits/i2bits-0.0.2.ebuild b/app-misc/i2bits/i2bits-0.0.2.ebuild
new file mode 100644
index 000000000000..0c0038f00054
--- /dev/null
+++ b/app-misc/i2bits/i2bits-0.0.2.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+DESCRIPTION="Utility to convert hex or dec to binary format"
+HOMEPAGE="https://bitbucket.org/PascalRD/i2bits/"
+SRC_URI="http://unixdev.ru/src/${P}.tar.gz"
+
+LICENSE="WTFPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_configure() {
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ cmake-utils_src_compile
+}
+
+src_install() {
+ cmake-utils_src_install
+}
diff --git a/app-misc/i2bits/metadata.xml b/app-misc/i2bits/metadata.xml
new file mode 100644
index 000000000000..82db40d0633d
--- /dev/null
+++ b/app-misc/i2bits/metadata.xml
@@ -0,0 +1,11 @@
+
+
+
+
+ monsieurp@gentoo.org
+ Patrice Clement
+
+
+ PascalRD/i2bits
+
+
diff --git a/app-misc/ranger/Manifest b/app-misc/ranger/Manifest
index 62d41c68093a..93416b5cebd5 100644
--- a/app-misc/ranger/Manifest
+++ b/app-misc/ranger/Manifest
@@ -1,2 +1,3 @@
DIST ranger-1.7.2.tar.gz 269713 SHA256 94f6e342daee4445f15db5a7440a11138487c49cc25da0c473bbf1b8978f5b79 SHA512 4815831bceb76bf15a68cdb09d3276192095b211ba06f0abeeec9529b0cb054341666c607f11b2c0acd1ff7de6fa3b71c9aab59db6bd5d1f0137e07619b522bd WHIRLPOOL 7985c470a789cd58a64d2e5e8eb7675ea4df8f71f0cac0bae7e49af599ab07d30a3ebe567e938649e69c812e8e2a4043e10004c708459a9a58b7c523fc34c6f3
DIST ranger-1.8.0.tar.gz 227368 SHA256 ce02476cb93d51b901eb6f5f0fc9675c58bd0a2f11d2ce0cdb667e15ec314092 SHA512 dd630c8aaca479925bc48982a2fab7c6f8999512985e37f0d7c5906ec1f8ed4b7b59fb0320dee5abf8ab7513a6f58528cdf64eaf8ca8d4528260cfba5916af40 WHIRLPOOL 54d8e9e0efaec5feae5c7d34adeb5d6880076ae2dfedb2cd26e5cdd2c593e7b3cc6e6089436ef44fd39fd4574a0d79a45661621bce0d508bbe317ec718c562cd
+DIST ranger-1.8.1.tar.gz 227415 SHA256 1433f9f9958b104c97d4b23ab77a2ac37d3f98b826437b941052a55c01c721b4 SHA512 40450d4e80017ac62d60ea6de231c10496fec1680f15a14006d3b87aae7f34cb2dbb6b810ced89527a4cba2975dcd6c037217e86fa806a0ba3cd39dc7dee8f04 WHIRLPOOL 29c6613befff82e883b9dcdf04f789338992d79a5cd6dcee46b19c21e80bd61b6de89567794d60c42696a4e7ed599e3606dfa9460558432a10169a2201a4e937
diff --git a/app-misc/ranger/ranger-1.8.1.ebuild b/app-misc/ranger/ranger-1.8.1.ebuild
new file mode 100644
index 000000000000..b9efb3ed911c
--- /dev/null
+++ b/app-misc/ranger/ranger-1.8.1.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+PYTHON_REQ_USE="ncurses"
+
+inherit distutils-r1
+
+if [[ ${PV} == "9999" ]] ; then
+ EGIT_REPO_URI="git://git.savannah.nongnu.org/ranger.git"
+ inherit git-r3
+else
+ SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
+ KEYWORDS="~amd64 ~ppc ~x86"
+fi
+
+DESCRIPTION="A vim-inspired file manager for the console"
+HOMEPAGE="http://ranger.nongnu.org/"
+LICENSE="GPL-3"
+SLOT="0"
+
+RDEPEND="virtual/pager"
+
+src_prepare() {
+ # use versioned doc path
+ sed -i "s|share/doc/ranger|share/doc/${PF}|" setup.py doc/ranger.1 || die
+
+ distutils-r1_src_prepare
+}
+
+pkg_postinst() {
+ if [[ -z ${REPLACING_VERSIONS} ]]; then
+ elog "Ranger has many optional dependencies to support enhanced file previews."
+ elog "See the README or homepage for more details."
+ fi
+}
diff --git a/app-misc/ranger/ranger-9999.ebuild b/app-misc/ranger/ranger-9999.ebuild
index a661a5eb28b2..b9efb3ed911c 100644
--- a/app-misc/ranger/ranger-9999.ebuild
+++ b/app-misc/ranger/ranger-9999.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-r3
else
SRC_URI="http://nongnu.org/${PN}/${P}.tar.gz"
- KEYWORDS="~amd64 ~x86"
+ KEYWORDS="~amd64 ~ppc ~x86"
fi
DESCRIPTION="A vim-inspired file manager for the console"
diff --git a/app-officeext/ooofbtools/ooofbtools-2.48.ebuild b/app-officeext/ooofbtools/ooofbtools-2.48.ebuild
index 6d10908d013b..14968ae08ee7 100644
--- a/app-officeext/ooofbtools/ooofbtools-2.48.ebuild
+++ b/app-officeext/ooofbtools/ooofbtools-2.48.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/fbtools/files/release/${MY_PN}-${PV}.zip"
LICENSE="GPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
RDEPEND="dev-libs/libxml2
app-arch/zip"
diff --git a/app-shells/bash/bash-4.3_p48.ebuild b/app-shells/bash/bash-4.3_p48.ebuild
deleted file mode 100644
index 0fef15d02b7e..000000000000
--- a/app-shells/bash/bash-4.3_p48.ebuild
+++ /dev/null
@@ -1,252 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils flag-o-matic toolchain-funcs multilib
-
-# Official patchlevel
-# See ftp://ftp.cwru.edu/pub/bash/bash-4.3-patches/
-PLEVEL=${PV##*_p}
-MY_PV=${PV/_p*}
-MY_PV=${MY_PV/_/-}
-MY_P=${PN}-${MY_PV}
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
- local opt=$1 plevel=${2:-${PLEVEL}} pn=${3:-${PN}} pv=${4:-${MY_PV}}
- [[ ${plevel} -eq 0 ]] && return 1
- eval set -- {1..${plevel}}
- set -- $(printf "${pn}${pv/\.}-%03d " "$@")
- if [[ ${opt} == -s ]] ; then
- echo "${@/#/${DISTDIR}/}"
- else
- local u
- for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${pn} ; do
- printf "${u}/${pn}-${pv}-patches/%s " "$@"
- done
- fi
-}
-
-# The version of readline this bash normally ships with.
-READLINE_VER="6.3"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="http://tiswww.case.edu/php/chet/bash/bashtop.html"
-SRC_URI="mirror://gnu/bash/${MY_P}.tar.gz $(patches)"
-[[ ${PV} == *_rc* ]] && SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd"
-IUSE="afs bashlogger examples mem-scramble +net nls plugins +readline"
-
-DEPEND=">=sys-libs/ncurses-5.2-r2:0=
- readline? ( >=sys-libs/readline-${READLINE_VER}:0= )
- nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
- !=dev-libs/libplatform-2.0.0
+ raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 )
+ xrandr? ( x11-libs/libXrandr )
+ python? ( ${PYTHON_DEPS} )"
+DEPEND="${RDEPEND}
+ python? ( dev-lang/swig )
+ virtual/pkgconfig"
+
+CONFIG_CHECK="~USB_ACM"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+pkg_pretend() {
+ linux-info_pkg_setup
+}
+
+pkg_setup() {
+ linux-info_pkg_setup
+ use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # Do not hardcode the python libpath #577612
+ sed -i \
+ -e '/DESTINATION/s:lib/python${PYTHON_VERSION}/dist-packages:${PYTHON_SITEDIR}:' \
+ src/libcec/cmake/CheckPlatformSupport.cmake || die
+
+ use python || cmake_comment_add_subdirectory "src/pyCecClient"
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DSKIP_PYTHON_WRAPPER=$(usex !python)
+ -DHAVE_EXYNOS_API=$(usex exynos)
+ -DHAVE_TDA995X_API=$(usex cubox)
+ -DHAVE_RPI_API=$(usex raspberry-pi)
+ )
+ use python && mycmakeargs+=(
+ -DPYTHON_SITEDIR="$(python_get_sitedir)"
+ )
+
+ # raspberrypi-userland itself does not provide .pc file so using
+ # bcm_host.pc instead
+ use raspberry-pi && mycmakeargs+=(
+ -DRPI_INCLUDE_DIR=$( $(tc-getPKG_CONFIG) --variable=includedir bcm_host) \
+ -DRPI_LIB_DIR=$( $(tc-getPKG_CONFIG) --variable=libdir bcm_host)
+ )
+
+ cmake-utils_src_configure
+}
+
+pkg_postinst() {
+ elog "You will need to ensure the user running your CEC client has"
+ elog "read/write access to the device. You can ensure this by adding"
+ elog "them to the uucp group"
+}
diff --git a/dev-libs/libdynd/Manifest b/dev-libs/libdynd/Manifest
index 695bfcc8db3d..b6d331fd255c 100644
--- a/dev-libs/libdynd/Manifest
+++ b/dev-libs/libdynd/Manifest
@@ -1,2 +1 @@
-DIST libdynd-0.6.5.tar.gz 1238404 SHA256 bf2e5c88995f0da880c3d7552c2541138c0f07eb6555f0ee10c77d805f8b3f65 SHA512 ebf64b94b38300e4e471f975a51e4b014879937e855af5d72a3f759af4445fa9024e42962ab1284ebe7b2ae2ddf51ea418d106c9894e1841f0984622afbef115 WHIRLPOOL 9222608edd8382ec2f8dbd7dd85eb0392d79a527d94f959f011430b2d15bbf405ccf06954e20679e26e93cd7c356b70f7490280e097cfc833ac015612a5cfe77
-DIST libdynd-0.6.6.tar.gz 1261349 SHA256 0e05eedd6b230f122a6c92fb6306be3017b0a5c460af5eace0074640455ef17e SHA512 efeb52a5b5dd3154ca293f388d5b967ff983450253435572b919f7c4a1445ad3cb416def4c736f908fdb3b06cddebae881a58420e528f1ca145973a997af7a28 WHIRLPOOL 8479f280a883f07382280b8fb94a3c21e8ef9975b67fe31bed83a40b9ad7e5b939c48ac76c638492faeb91143e449471c0d316078066c4d9752e4b238f3cd822
+DIST libdynd-0.7.2.tar.gz 1342364 SHA256 be764817ca6e72dd65a32698b0a7f64df111b732c3230b5b8a8bfc72a3b0c750 SHA512 134195ba5839e05af07dd9ad0b8e749a83345511acd2a22a029a4d9a2c0fc77a8a1f36722bce20653d28189b7883afe7feb651c7d32ff921ef257a8a9aa4bd7f WHIRLPOOL 4969f747f3b0cf1a46681aaae78d470762aa6321aea8f0cf95ef55ee061a247fb24c6d8667adff5ebf6bfdf99408dfdcf8e5cd4ed37c00fb856a5eae8127c615
diff --git a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch b/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch
deleted file mode 100644
index 9659372b05ea..000000000000
--- a/dev-libs/libdynd/files/libdynd-0.6.0-dont-install-test.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- tests/CMakeLists.txt.orig 2014-02-10 14:25:18.041841087 -0800
-+++ tests/CMakeLists.txt 2014-02-10 14:25:40.224975614 -0800
-@@ -105,12 +105,6 @@
- )
- endif()
-
--# If installation is requested, install the program
--if (DYND_INSTALL_LIB)
-- install(TARGETS test_libdynd
-- RUNTIME DESTINATION bin)
--endif()
--
- # Compile-time tests: test code that is supposed to produce compile errors
- # I couldn't find a properly specified way to do this, so hacked together
- # this function.
diff --git a/dev-libs/libdynd/libdynd-0.6.5.ebuild b/dev-libs/libdynd/libdynd-0.6.5.ebuild
deleted file mode 100644
index 49451de5e38a..000000000000
--- a/dev-libs/libdynd/libdynd-0.6.5.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib cuda
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=2e140844d4a21c436ca0fc46996bf8606ffc21d5
-
-DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
-HOMEPAGE="https://github.com/ContinuumIO/libdynd"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc fftw test"
-
-RDEPEND="
- dev-libs/c-blosc:0=
- cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
- fftw? ( sci-libs/fftw:3.0 )
- "
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
- # each relase comes with a different set...
- # remove forced strong flags
- sed -i \
- -e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
- -e "s|@DYND_VERSION@|${PV}|" \
- -e 's|-fomit-frame-pointer||' \
- -e 's|-Werror||g' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- sed -i \
- -e '/add_subdirectory(examples)/d' \
- CMakeLists.txt || die
- local mycmakeargs=(
- -DDYND_SHARED_LIB=ON
- -DDYND_INSTALL_LIB=ON
- $(cmake-utils_use cuda DYND_CUDA)
- $(cmake-utils_use test DYND_BUILD_TESTS)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ./tests/test_libdynd || die
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc documents/*
-}
diff --git a/dev-libs/libdynd/libdynd-0.6.6.ebuild b/dev-libs/libdynd/libdynd-0.6.6.ebuild
deleted file mode 100644
index 5962297ce6e0..000000000000
--- a/dev-libs/libdynd/libdynd-0.6.6.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit cmake-utils multilib cuda
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=09fb7e5eccadbe1ec49ff4b05fec724939331e6d
-
-DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
-HOMEPAGE="https://github.com/ContinuumIO/libdynd"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="cuda doc fftw test"
-
-RDEPEND="
- dev-libs/c-blosc:0=
- cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit )
- fftw? ( sci-libs/fftw:3.0 )
- "
-DEPEND="${RDEPEND}"
-
-DOCS=( README.md )
-
-PATCHES=(
- "${FILESDIR}"/${PN}-0.6.0-dont-install-test.patch
-)
-
-src_prepare() {
- cmake-utils_src_prepare
- # each relase comes with a different set...
- # remove forced strong flags
- sed -i \
- -e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
- -e "s|@DYND_VERSION@|${PV}|" \
- -e 's|-fomit-frame-pointer||' \
- -e 's|-Werror||g' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- sed -i \
- -e '/add_subdirectory(examples)/d' \
- CMakeLists.txt || die
- local mycmakeargs=(
- -DDYND_SHARED_LIB=ON
- -DDYND_INSTALL_LIB=ON
- $(cmake-utils_use cuda DYND_CUDA)
- $(cmake-utils_use test DYND_BUILD_TESTS)
- )
- cmake-utils_src_configure
-}
-
-src_test() {
- cd "${BUILD_DIR}" || die
- ./tests/test_libdynd || die
-}
-
-src_install() {
- cmake-utils_src_install
- use doc && dodoc documents/*
-}
diff --git a/dev-libs/libdynd/libdynd-0.7.2.ebuild b/dev-libs/libdynd/libdynd-0.7.2.ebuild
new file mode 100644
index 000000000000..676c881b710e
--- /dev/null
+++ b/dev-libs/libdynd/libdynd-0.7.2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils cuda
+
+# change each new libdynd version, to avoid git in tree dependency
+DYND_GIT_SHA1=341d6d91931fdb04ad657d27ed740cf533fc925b
+
+DESCRIPTION="C++ dynamic multi-dimensionnal array library with Python exposure"
+HOMEPAGE="http://libdynd.org"
+SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="cuda doc fftw mkl test"
+
+RDEPEND="
+ dev-libs/c-blosc:0=
+ cuda? ( dev-util/nvidia-cuda-toolkit )
+ fftw? ( sci-libs/fftw:3.0 )
+"
+DEPEND="${RDEPEND}
+ doc? ( app-doc/doxygen[dot] )
+"
+
+DOCS=( README.md )
+
+src_prepare() {
+ use cuda && cuda_src_prepare
+ cmake-utils_src_prepare
+ cmake_comment_add_subdirectory examples
+ # fix forced cxxflags and doc installation directory
+ sed -e 's|-O3 -fomit-frame-pointer||' \
+ -e 's|-Werror||g' \
+ -e "s|docs DESTINATION docs|docs/html DESTINATION share/doc/${PF}|" \
+ -i CMakeLists.txt || die
+ # don't install test exec
+ sed -e 's|install(TARGETS test_libdynd||' \
+ -e 's|RUNTIME DESTINATION bin)||' \
+ -i tests/CMakeLists.txt || die
+ # remove the version mangling from git stuff it requires a git clone
+ # rather force set it a configure time
+ sed -e '/GetGitRev/d' \
+ -e '/get_git_/d' \
+ -e '/git_describe/d' \
+ -e '/dirty/d' \
+ -i CMakeLists.txt || die
+ # not tested
+ if use mkl; then
+ sed -e "s|/opt/intel/.*|$(ls -1d ${EPREFIX}/opt/intel/compilers*)|" \
+ -i tests/CMakeLists.txt || die
+ fi
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DDYND_GIT_SHA1="${DYND_GIT_SHA1}"
+ -DDYND_VERSION_STRING="v${PV}"
+ -DDYND_INSTALL_LIB=ON
+ -DDYND_SHARED_LIB=ON
+ -DDYND_BUILD_BENCHMARKS=OFF
+ -DDYND_BUILD_DOCS="$(usex doc)"
+ -DDYND_BUILD_PLUGIN="$(usex mkl)"
+ -DDYND_BUILD_TESTS="$(usex test)"
+ -DDYND_CUDA="$(usex cuda)"
+ -DDYND_FFTW="$(usex fftw)"
+ -DFFTW_PATH="${EPREFIX}/usr/include"
+ )
+ cmake-utils_src_configure
+}
+
+src_test() {
+ cd "${BUILD_DIR}" || die
+ ./tests/test_libdynd || die
+}
diff --git a/dev-libs/libdynd/metadata.xml b/dev-libs/libdynd/metadata.xml
index 902c488513b3..0b3978ba39fe 100644
--- a/dev-libs/libdynd/metadata.xml
+++ b/dev-libs/libdynd/metadata.xml
@@ -6,19 +6,20 @@
Gentoo Science Project
- LibDyND, a component of the Blaze project, is a C++ library for
- dynamic, multidimensional arrays. It is inspired by NumPy, the
- Python array programming library at the core of the scientific
- Python stack, but tries to address a number of obstacles encountered
- by some of its users. Examples of this are support for
- variable-sized string and ragged array types. The library is in a
- preview development state, and can be thought of as a sandbox where
- features are being tried and tweaked to gain experience with them.
-
+ LibDyND, a component of the Blaze project, is a C++ library for
+ dynamic, multidimensional arrays. It is inspired by NumPy, the
+ Python array programming library at the core of the scientific
+ Python stack, but tries to address a number of obstacles encountered
+ by some of its users. Examples of this are support for
+ variable-sized string and ragged array types. The library is in a
+ preview development state, and can be thought of as a sandbox where
+ features are being tried and tweaked to gain experience with them.
+
- ContinuumIO/libdynd
+ libdynd/libdynd
diff --git a/dev-libs/pugixml/pugixml-1.8.ebuild b/dev-libs/pugixml/pugixml-1.8.ebuild
index af0347733d2c..fd81d0eadc00 100644
--- a/dev-libs/pugixml/pugixml-1.8.ebuild
+++ b/dev-libs/pugixml/pugixml-1.8.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
src_configure() {
local mycmakeargs=( -DBUILD_SHARED_LIBS=ON )
diff --git a/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
new file mode 100644
index 000000000000..cd4446fd2f05
--- /dev/null
+++ b/dev-php/PEAR-Net_DNSBL/PEAR-Net_DNSBL-1.3.7-r1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="PHP library to query DNS blacklists"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86"
+IUSE="examples"
+RDEPEND="dev-lang/php:*
+ dev-php/PEAR-Cache_Lite
+ dev-php/PEAR-HTTP_Request2
+ dev-php/PEAR-Net_DNS
+ dev-php/PEAR-PEAR
+ examples? ( dev-lang/php:*[cli] dev-php/PEAR-Console_Getopt )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+ use examples && dodoc -r examples
+
+ insinto /usr/share/php
+ doins -r Net
+}
diff --git a/dev-php/PEAR-Net_DNSBL/metadata.xml b/dev-php/PEAR-Net_DNSBL/metadata.xml
index aca42932b833..770ab1c7fcac 100644
--- a/dev-php/PEAR-Net_DNSBL/metadata.xml
+++ b/dev-php/PEAR-Net_DNSBL/metadata.xml
@@ -1,8 +1,11 @@
-
- php-bugs@gentoo.org
- PHP
-
+
+ php-bugs@gentoo.org
+ PHP
+
+
+ pear/Net_DNSBL
+
diff --git a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r1.ebuild b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r1.ebuild
deleted file mode 100644
index 70f59124a801..000000000000
--- a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-inherit php-pear-r1
-
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="Code Beautifier for PHP"
-LICENSE="PHP-3"
-SLOT="0"
-IUSE=""
-
-DEPEND="dev-lang/php[tokenizer]"
-RDEPEND="$DEPEND >=dev-php/PEAR-Log-1.8"
-
-pkg_postinst() {
- if ! has_version dev-lang/php[bzip2] ; then
- elog "${PN} can optionally use bzip2 features."
- elog "If you want those, emerge dev-lang/php with this flag in USE."
- fi
-}
diff --git a/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
new file mode 100644
index 000000000000..0e6cb5d43163
--- /dev/null
+++ b/dev-php/PEAR-PHP_Beautifier/PEAR-PHP_Beautifier-0.1.15-r2.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+MY_PN="${PN/PEAR-/}"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Code Beautifier for PHP"
+HOMEPAGE="http://pear.php.net/package/${MY_PN}"
+SRC_URI="http://download.pear.php.net/package/${MY_P}.tgz"
+LICENSE="PHP-3.01"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="cli examples"
+
+# Require automagic dependencies unconditionally to avoid surprises.
+RDEPEND="dev-lang/php:*[bzip2,cli?,tokenizer]
+ dev-php/PEAR-Archive_Tar
+ dev-php/PEAR-Log
+ dev-php/PEAR-PEAR
+ cli? ( dev-php/PEAR-Console_Getopt )"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=( "${FILESDIR}/use_default_error_reporting.patch" )
+
+src_prepare() {
+ default
+ shopt -s globstar
+ for file in scripts/php_beautifier **/*.php; do
+ sed -i "s|@package_version@|${PV}|g" "${file}" || die
+ sed -i "s|@php_bin@|${EPREFIX}/usr/bin/php|g" "${file}" || die
+ done
+ shopt -u globstar
+}
+
+src_install() {
+ insinto /usr/share/php/PHP
+ doins Beautifier.php
+ doins -r Beautifier
+ use examples && dodoc -r examples
+ use cli && dobin scripts/php_beautifier
+}
diff --git a/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch b/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch
new file mode 100644
index 000000000000..cf1019b3399c
--- /dev/null
+++ b/dev-php/PEAR-PHP_Beautifier/files/use_default_error_reporting.patch
@@ -0,0 +1,44 @@
+From 39e6b5605bd15db6a1f2f223dede9c8d2265140c Mon Sep 17 00:00:00 2001
+From: Michael Orlitzky
+Date: Mon, 9 Jan 2017 22:34:30 -0500
+Subject: [PATCH 1/1] Use the default PHP error_reporting value.
+
+The php_beautifier script triggers some strict/deprecation warnings
+with newer versions of PHP. With error_reporting = E_ALL, they are
+shown to the user. Instead, we can at least respect the default
+value of error_reporting from php.ini which (on Gentoo, anyway)
+hides strict/deprecation warnings.
+---
+ Beautifier.php | 2 +-
+ scripts/php_beautifier | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/Beautifier.php b/Beautifier.php
+index 584ac4d..90d8d0b 100755
+--- a/Beautifier.php
++++ b/Beautifier.php
+@@ -19,7 +19,7 @@
+ * @license http://www.php.net/license/3_0.txt PHP License 3.0
+ * @version CVS: $Id:$
+ */
+-error_reporting(E_ALL);
++// error_reporting(E_ALL);
+ // Before all, test the tokenizer extension
+ if (!extension_loaded('tokenizer')) {
+ throw new Exception("Compile php with tokenizer extension. Use --enable-tokenizer or don't use --disable-all on configure.");
+diff --git a/scripts/php_beautifier b/scripts/php_beautifier
+index 255a264..6e87f4e 100755
+--- a/scripts/php_beautifier
++++ b/scripts/php_beautifier
+@@ -52,7 +52,7 @@
+ */
+ require_once 'PHP/Beautifier/Batch.php';
+ define('PHP_Beautifier_WINDOWS', substr(PHP_OS, 0, 3) == 'WIN');
+- error_reporting(E_ALL);
++ // error_reporting(E_ALL);
+ // get log object
+ $oLog = PHP_Beautifier_Common::getLog();
+
+--
+2.10.2
+
diff --git a/dev-php/PEAR-PHP_Beautifier/metadata.xml b/dev-php/PEAR-PHP_Beautifier/metadata.xml
index b86acf66c756..f4c6d8d4f90c 100644
--- a/dev-php/PEAR-PHP_Beautifier/metadata.xml
+++ b/dev-php/PEAR-PHP_Beautifier/metadata.xml
@@ -1,8 +1,17 @@
-
- php-bugs@gentoo.org
- PHP
-
+
+ php-bugs@gentoo.org
+ PHP
+
+
+
+ clbustos/PHP_Beautifier
+
diff --git a/dev-python/bcolz/bcolz-0.12.1.ebuild b/dev-python/bcolz/bcolz-0.12.1.ebuild
index 8816a868e0da..d9f00874cc71 100644
--- a/dev-python/bcolz/bcolz-0.12.1.ebuild
+++ b/dev-python/bcolz/bcolz-0.12.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc test"
# numexpr is optional but set hard rdepend
diff --git a/dev-python/blaze/blaze-0.10.2.ebuild b/dev-python/blaze/blaze-0.10.2.ebuild
index fbbadcd49d71..c8427d73ae85 100644
--- a/dev-python/blaze/blaze-0.10.2.ebuild
+++ b/dev-python/blaze/blaze-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
# Currently doc build fails, reason now, attempt to import mystery modules in datashape
# Leaving doc build content in case this is fixed
diff --git a/dev-python/blosc/Manifest b/dev-python/blosc/Manifest
index 3892cce89430..04d68999bf68 100644
--- a/dev-python/blosc/Manifest
+++ b/dev-python/blosc/Manifest
@@ -1 +1,2 @@
DIST blosc-1.2.8.tar.gz 259299 SHA256 fc8996733de73d70cc2482f98972a38a908ca7286d30429fe828390b1bb010c3 SHA512 8349a7b401e3b55b066efa4d647255dc7bc735a1de0eca5e33b2deb4ca90e317b90d6ea42433ed06f2680bccb2198e0e4bbdbf5a0fd1c22db900aa896c88427e WHIRLPOOL 1139c9f167565df0fd22fdddf20416db2bf214c6a58e45f0c3bd2118142d9782ff53e9e263f1fafbb79bb69ae17c9fad925accdaa009d7087c725c113e039d18
+DIST blosc-1.4.4.tar.gz 613097 SHA256 76ae6e1cecddb320b5567ba78ee9a2ee31895ecba838fdf05fdb9131939a4705 SHA512 0a7da71086eda4fb7851a3ad1f3cbfe231a9b97d0177e6cc085f2b600d33ce0a71cc361bcfd682a526002465d375e89b7397270953ecf163db1922a9d51ac8e4 WHIRLPOOL dd2404ecd5fd592fb38e3fd68bd06f48025e28543cf0119713a8575044db13c592818b7da753f55092aaef6c0ed488fd4cf4b64e25f050580a26440e43bf050a
diff --git a/dev-python/blosc/blosc-1.2.8.ebuild b/dev-python/blosc/blosc-1.2.8.ebuild
index 85dd82953dcb..49eb4b479df0 100644
--- a/dev-python/blosc/blosc-1.2.8.ebuild
+++ b/dev-python/blosc/blosc-1.2.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
SLOT="0"
LICENSE="MIT"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND=">=dev-libs/c-blosc-1.3.5"
diff --git a/dev-python/blosc/blosc-1.4.4.ebuild b/dev-python/blosc/blosc-1.4.4.ebuild
new file mode 100644
index 000000000000..de81068d2b94
--- /dev/null
+++ b/dev-python/blosc/blosc-1.4.4.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+DESCRIPTION="High performance compressor optimized for binary data"
+HOMEPAGE="http://python-blosc.blosc.org"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="test"
+
+RDEPEND="dev-libs/c-blosc:="
+DEPEND="${RDEPEND}
+ dev-python/setuptools[${PYTHON_USEDEP}]
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )"
+
+python_prepare_all() {
+ export BLOSC_DIR="${EPREFIX}/usr"
+ distutils-r1_python_prepare_all
+}
+
+python_test() {
+ cd "${BUILD_DIR}"/lib || die
+ nosetests -v || die
+}
diff --git a/dev-python/blosc/metadata.xml b/dev-python/blosc/metadata.xml
index de65e6670590..05e88ce58aa7 100644
--- a/dev-python/blosc/metadata.xml
+++ b/dev-python/blosc/metadata.xml
@@ -6,14 +6,13 @@
Gentoo Science Project
- blosc is a high performance compressor optimized
- for binary data. It has been designed to transmit data to the
- processor cache faster than the traditional, non-compressed, direct
- memory fetch approach via a memcpy() OS call.
- Blosc works well for compressing numerical arrays that contains data
- with relatively low entropy, like sparse data, time series, grids with
- regular-spaced values, etc.
- python-blosc a Python package that wraps Blosc.
+ blosc is a high performance compressor optimized for binary
+ data. It has been designed to transmit data to the processor cache
+ faster than the traditional, non-compressed, direct memory fetch
+ approach via a memcpy() OS call. Blosc works well for compressing
+ numerical arrays that contains data with relatively low entropy,
+ like sparse data, time series, grids with regular-spaced values,
+ etc. This is the python wrapper.
blosc
diff --git a/dev-python/dask/dask-0.10.2.ebuild b/dev-python/dask/dask-0.10.2.ebuild
index b168f7b2e7e2..f87d9b4378f0 100644
--- a/dev-python/dask/dask-0.10.2.ebuild
+++ b/dev-python/dask/dask-0.10.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="test"
RDEPEND="
diff --git a/dev-python/datashape/Manifest b/dev-python/datashape/Manifest
index dd19e7b5a111..e0f21943b9ae 100644
--- a/dev-python/datashape/Manifest
+++ b/dev-python/datashape/Manifest
@@ -7,3 +7,4 @@ DIST datashape-0.5.0.tar.gz 97748 SHA256 d0b7eafd84fbc75941e274b1bd9c26327ee90f3
DIST datashape-0.5.1.tar.gz 98160 SHA256 bbb1dbcbfa285c4ecf0d2ee14b7017b3ea357935537c736bc51eca07d2bd4f47 SHA512 cb882b76f2b0a0f0321fcb41fe59dd5a1465f07bc58dc817400cd2d17d8a2b34a2ca944c24629616684ea6c6cf3f19365f539a2b58baf83f8ecebe6896a8beb8 WHIRLPOOL 7b78d1a0fbc1233666915715448d4552b948b82198773b5d13f43169f59513e43ceca2ccb9d625d64d83f58f122272f56b952cb3d0156c0f8b7512427f702490
DIST datashape-0.5.2.tar.gz 99032 SHA256 7f964969944bfcd61904c4f40210429723d0db91e57d543660b38bbe1da4806b SHA512 731d65d0dd82310d0101386bb0df8169f940d8e6e3a749fd2b40996ee8dddf046ae83bdee0417e0bb156e6d8c00a03f53839a1b5eae4c4867eedfff338df99e6 WHIRLPOOL f876bfe31446b0a573b8293a068ef45fc53dc1845aa10bf86ab23ffff9ea2fc6a481f5c11288c5b971fc626b93dfd41baf22f54423b13d441d167d60ab598182
DIST datashape-0.5.3.tar.gz 99757 SHA256 a4c9d54145ce9ec5d971073aec72c3066efec5a180d711f5a07d02b434e822d3 SHA512 f9542bdfbbf1d28023551023fef283385ee4b431e28c7ca8552727f5eb9deee9b6d022acbc694070f13e1441c1b0fe30963719e7b11326969edeca1193db41ab WHIRLPOOL 03c08314a3f0933f1b5a90061d43ca7c487be7e05a34349e6a464c8f3524cafbb62b2605fd18b3ca861c0fc733b04d9a788dbd9c54730c06c8118a72daa63e11
+DIST datashape-0.5.4.tar.gz 99343 SHA256 c266c5803dde48b9fa8d8ee51b5b5979ef77443060e32db2d225b72648c638a5 SHA512 3640c3871e6a00ad5c9961586821c0aab94ed10e82f5c2d361707c66853025aec70793f74f057c30a7bbc58d4645791b33df2916732e703586fd6bb84e91bdfa WHIRLPOOL b3ceec74c95329dbe9ac041344babeaa2b7f4df82de18797fffad590a57b00088e833cf79adf031effc7350e1772b5cd4210fc1a121eebe4749b8bfee6886117
diff --git a/dev-python/datashape/datashape-0.5.4.ebuild b/dev-python/datashape/datashape-0.5.4.ebuild
new file mode 100644
index 000000000000..a04a3bfe5451
--- /dev/null
+++ b/dev-python/datashape/datashape-0.5.4.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="Language defining a data description protocol"
+HOMEPAGE="https://github.com/ContinuumIO/datashape"
+SRC_URI="https://github.com/ContinuumIO/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ >=dev-python/multipledispatch-0.4.7[${PYTHON_USEDEP}]
+ dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+DEPEND="
+ doc? ( ${RDEPEND} dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( ${RDEPEND}
+ dev-python/mock[${PYTHON_USEDEP}]
+ dev-python/pytest[${PYTHON_USEDEP}]
+ )
+"
+
+python_prepare_all() {
+ # Prevent un-needed d'loading
+ sed -e "s/'sphinx.ext.intersphinx', //" -i docs/source/conf.py || die
+ distutils-r1_python_prepare_all
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ py.test || die "Tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+ use doc && local HTML_DOCS=( docs/build/html/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/dynd-python/Manifest b/dev-python/dynd-python/Manifest
index 97437440fdff..ef8a3219c7ea 100644
--- a/dev-python/dynd-python/Manifest
+++ b/dev-python/dynd-python/Manifest
@@ -1,2 +1 @@
-DIST dynd-python-0.6.5.tar.gz 231313 SHA256 63552c19d7da7a6dd417d75de45af61aa70f336e09d48fea0f5f9f571b41785d SHA512 46af19bc26c8f410ac26d4e756a726a56f2d852bfa21dca03c4c47210ed9074a7e017bdd2ecb1de3d00af37815b4a20885cd7945af4c8536941e9106bcf49f12 WHIRLPOOL 7a8941b0b678f4cf83eea7906ef060afa60a3d3168ca1a375ba8349b26cdba2437624150b8494d8f26bbb80f4cf4a8ca30685fb38aa9088b62e7df927dcdc8e0
-DIST dynd-python-0.6.6.tar.gz 233618 SHA256 cfd71413832c8c44f8357268ffce99f013184c339bfda5a9186610e57f32644d SHA512 c6be9acf0a4dd2446d613cc0c251b56fcd529fac733ecd63d0450806d7f4af2191ef4e861d015177140ca997464b591562a9f478ea83638516fab8552ee88c06 WHIRLPOOL b60e3d774fab77df19788b6eb8f812a19126a109ca7158de7eed2ffbacb3da7866935c39da985323dba3e79817225732d4ebd27d584913709ab527dbf05781ad
+DIST dynd-python-0.7.2.tar.gz 184981 SHA256 b86f9e25d0fc9dd9ed89181cbfc0085c767fb3170e0d708767986d00063e96f3 SHA512 e51df7b368b1f6869338cb12a2f093064b1e7531ef674a83dbc7b9cc1dc6143cbe12cb37273bcc01e7b1066eda541b3b15473bc01e88fd9a8d1b594f6f37eaba WHIRLPOOL 11591748f2da74bc0ba803b58f5557f647ce52d890e5621b9fc834ed27a41cf71038690656948a4f4cf9791023887ba4efee25acdd3286db8424094f02acddb4
diff --git a/dev-python/dynd-python/dynd-python-0.6.5.ebuild b/dev-python/dynd-python/dynd-python-0.6.5.ebuild
deleted file mode 100644
index 373dc80cf7c8..000000000000
--- a/dev-python/dynd-python/dynd-python-0.6.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-
-inherit cmake-utils python-r1
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=e5578b6b862c025dd757f77aaae69be48cde5613
-
-DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
-HOMEPAGE="https://github.com/ContinuumIO/dynd-python"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-IUSE="doc test"
-
-RDEPEND="
- ~dev-libs/libdynd-${PV}
- >=dev-python/numpy-1.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=dev-python/cython-0.19[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6.2-out-of-git-versioning.patch )
-
-src_prepare() {
- cmake-utils_src_prepare
- # each relase comes with a different set...
- # remove forced strong flags
- sed -i \
- -e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
- -e "s|@DYND_VERSION@|${PV}|" \
- -e 's|-g -fomit-frame-pointer||' \
- -e 's|-Werror||g' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_SEPARATE_LIBDYND=ON
- -DDYND_INSTALL_LIB=ON
- $(cmake-utils_use test DYND_BUILD_TESTS)
- )
- python_foreach_impl cmake-utils_src_configure
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_make
- use doc && emake -C doc html
-}
-
-src_test() {
- testing() {
- cmake-utils_src_make DESTDIR="${WORKDIR}-test-${EPYTHON}" install
- cd "${WORKDIR}-test-${EPYTHON}"/$(python_get_sitedir) || die
- ${PYTHON} -c 'import dynd; dynd.test()' || die
- }
- python_foreach_impl testing
-}
-
-src_install() {
- python_foreach_impl cmake-utils_src_install
- dodoc README.md
- use doc && dohtml -r doc/build/html/*
-}
diff --git a/dev-python/dynd-python/dynd-python-0.6.6.ebuild b/dev-python/dynd-python/dynd-python-0.6.6.ebuild
deleted file mode 100644
index 7fe0f304b286..000000000000
--- a/dev-python/dynd-python/dynd-python-0.6.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit cmake-utils python-r1
-
-# change each release, to avoid git in tree dependency
-DYND_GIT_SHA1=d7ec36c6f1beb0621d6037ab0953db7e4c1b9150
-
-DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
-HOMEPAGE="https://github.com/ContinuumIO/dynd-python"
-SRC_URI="https://github.com/ContinuumIO/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc test"
-
-RDEPEND="
- ~dev-libs/libdynd-${PV}
- >=dev-python/numpy-1.5[${PYTHON_USEDEP}]
-"
-DEPEND="${RDEPEND}
- >=dev-python/cython-0.19[${PYTHON_USEDEP}]
- test? ( dev-python/nose[${PYTHON_USEDEP}] )
-"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.6.2-out-of-git-versioning.patch )
-
-src_prepare() {
- cmake-utils_src_prepare
- # each relase comes with a different set...
- # remove forced strong flags
- sed -i \
- -e "s|@DYND_GIT_SHA1@|${DYND_GIT_SHA1}|" \
- -e "s|@DYND_VERSION@|${PV}|" \
- -e 's|-g -fomit-frame-pointer||' \
- -e 's|-Werror||g' \
- CMakeLists.txt || die
-}
-
-src_configure() {
- local mycmakeargs=(
- -DUSE_SEPARATE_LIBDYND=ON
- -DDYND_INSTALL_LIB=ON
- $(cmake-utils_use test DYND_BUILD_TESTS)
- )
- python_foreach_impl cmake-utils_src_configure
-}
-
-src_compile() {
- python_foreach_impl cmake-utils_src_make
- use doc && emake -C doc html
-}
-
-src_test() {
- testing() {
- cmake-utils_src_make DESTDIR="${WORKDIR}-test-${EPYTHON}" install
- cd "${WORKDIR}-test-${EPYTHON}"/$(python_get_sitedir) || die
- ${PYTHON} -c 'import dynd; dynd.test()' || die
- }
- python_foreach_impl testing
-}
-
-src_install() {
- python_foreach_impl cmake-utils_src_install
- dodoc README.md
- use doc && dohtml -r doc/build/html/*
-}
diff --git a/dev-python/dynd-python/dynd-python-0.7.2.ebuild b/dev-python/dynd-python/dynd-python-0.7.2.ebuild
new file mode 100644
index 000000000000..3ab41b4f24a2
--- /dev/null
+++ b/dev-python/dynd-python/dynd-python-0.7.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 python3_{4,5} )
+
+inherit distutils-r1
+
+# change each new dynd version, to avoid git in tree dependency
+DYND_PYTHON_GIT_SHA1=8cdef57e71c784d7fe1f3f97a2ce2ce5727a89f1
+
+DESCRIPTION="Python exposure of multidimensionnal array library libdynd"
+HOMEPAGE="http://libdynd.org/"
+SRC_URI="https://github.com/libdynd/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc test"
+
+RDEPEND="
+ ~dev-libs/libdynd-${PV}
+ dev-python/numpy[${PYTHON_USEDEP}]
+"
+DEPEND="${RDEPEND}
+ dev-python/cython[${PYTHON_USEDEP}]
+ doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
+ test? ( dev-python/nose[${PYTHON_USEDEP}] )
+"
+src_prepare() {
+ default
+ # remove the version mangling from git stuff it requires a git clone
+ # rather force set it a configure time
+ sed -e "/--dirty/s/ver =.*/ver = 'v${PV}'/" \
+ -e '/--always/d' \
+ -i setup.py || die
+ sed -e "s/get_git.*/set(DYND_PYTHON_GIT_SHA1 ${DYND_PYTHON_GIT_SHA1})/" \
+ -e "s/git_describe.*/set(DYND_PYTHON_VERSION_STRING v${PV})/" \
+ -e 's|-g -fomit-frame-pointer||' \
+ -e 's|-Werror||g' \
+ -i CMakeLists.txt || die
+}
+
+python_compile_all() {
+ use doc && emake -C docs html
+}
+
+python_test() {
+ cd "${BUILD_DIR}/lib" || die
+ PYTHONPATH=${BUILD_DIR}/lib nosetests -v || die
+}
+
+src_install() {
+ use doc && HTML_DOCS=( docs/build/html/. )
+ distutils-r1_src_install
+}
diff --git a/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch b/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch
deleted file mode 100644
index 29c3541b3274..000000000000
--- a/dev-python/dynd-python/files/dynd-python-0.6.2-out-of-git-versioning.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- CMakeLists.txt.orig 2014-05-12 14:00:52.000000000 +0400
-+++ CMakeLists.txt 2014-05-12 14:03:39.000000000 +0400
-@@ -86,8 +86,9 @@
- endif()
-
- # Get the git revision
--get_git_head_revision("${CMAKE_CURRENT_SOURCE_DIR}" GIT_REFSPEC DYND_PYTHON_GIT_SHA1)
--git_describe("${CMAKE_CURRENT_SOURCE_DIR}" DYND_PYTHON_VERSION_STRING --dirty --always --match "v*")
-+SET(DYND_PYTHON_GIT_SHA1 "@DYND_PYTHON_GIT_SHA1@")
-+SET(DYND_PYTHON_VERSION_STRING "@DYND_PYTHON_VERSION@")
-+
- message(STATUS "DyND-Python version: ${DYND_PYTHON_VERSION_STRING}")
- configure_file(
- "${CMAKE_CURRENT_SOURCE_DIR}/src/git_version.cpp.in"
diff --git a/dev-python/dynd-python/metadata.xml b/dev-python/dynd-python/metadata.xml
index 4205da1fae58..67e99838f6fd 100644
--- a/dev-python/dynd-python/metadata.xml
+++ b/dev-python/dynd-python/metadata.xml
@@ -5,15 +5,11 @@
sci@gentoo.org
Gentoo Science Project
-
- python@gentoo.org
- Python
-
- DyND-Python, a component of the Blaze project, is the Python
- exposure of the DyND dynamic multi-dimensional array library.
-
+ DyND-Python, a component of the Blaze project, is the Python
+ exposure of the DyND dynamic multi-dimensional array library.
+
- ContinuumIO/dynd-python
+ libdynd/dynd-python
diff --git a/dev-python/flask-cors/flask-cors-2.1.0.ebuild b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
index f142eb2e254e..6db71d7e656f 100644
--- a/dev-python/flask-cors/flask-cors-2.1.0.ebuild
+++ b/dev-python/flask-cors/flask-cors-2.1.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -23,7 +23,7 @@ HOMEPAGE="https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/F
LICENSE="MIT"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc test"
RDEPEND="dev-python/flask[${PYTHON_USEDEP}]
diff --git a/dev-python/locket/locket-0.2.0.ebuild b/dev-python/locket/locket-0.2.0.ebuild
index 0fba6875326f..282a478cfcbd 100644
--- a/dev-python/locket/locket-0.2.0.ebuild
+++ b/dev-python/locket/locket-0.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE=""
RDEPEND=""
diff --git a/dev-python/multipledispatch/Manifest b/dev-python/multipledispatch/Manifest
index e345fb843c0e..3845a0c93438 100644
--- a/dev-python/multipledispatch/Manifest
+++ b/dev-python/multipledispatch/Manifest
@@ -1,3 +1,4 @@
DIST multipledispatch-0.4.6.tar.gz 7066 SHA256 9974135f46af8f22096f0517afede26a9b2e015aed9e154c4f5e3173a447162c SHA512 90b7f0ca33abd149ce130124a6464c531698582bb831260266cca1779bf661b6868a3eaff1eab66072e84c464d3bdde517d61b970d6385f33f583fa9bc034d2c WHIRLPOOL 319f1fc7d9a6ea77f2c22a849cd7e5808c21cc792aa5168fdf3adfefe5dea65c17910245db6eb8aefdd74dd72643f3261fb67b9937c47439a897285e462fbeb8
DIST multipledispatch-0.4.7.tar.gz 7234 SHA256 401bb875cdbd85359f01029e60ef7610bf1172b5052474285daf4102b109496d SHA512 ab1109848560bfbdf66c07d42459729a8e9ee100e4113404447c96e810f52a48bb4aef435e7b4997dfcb1d59959ce491f329c1566f5c4d6c5f6c298a74125d55 WHIRLPOOL 1061fd465f98aee880128cfde7320f5e6c671964382ee24c0b9e296113575296ad833e0e438ff2921795d14f6d2a0d2cc2c893716b4b59394a23445d6e64ee44
DIST multipledispatch-0.4.8.tar.gz 7393 SHA256 07d41fb3ed25e8424536e48a8566f88a0f9926ca4b6174bff6aa16c98251b92e SHA512 7ca66b4d34a8002babb83678bfc11b1851a23fafea8f59c8240a7c3e8912918439dda236a75c8ae50064e5e87920cf5a7db290a67d6afe1c178010b76c89345d WHIRLPOOL 26263306f29240c052709c2ae5367fd88c936c74e94a478b3474c85c945842d2108d47432e8d855836d9989418cff890a418e51b7c2360899d71bd20cf1b85d5
+DIST multipledispatch-0.4.9.tar.gz 7541 SHA256 bda6abb8188d9abb429bd17ed15bc7433f77f1b05a78cfff761711ed81daa7a2 SHA512 b59f73f6d500c5cbb5e45eab9f6ecea45a211764cd8e7adbbf85c29510862bc5427f13dd652a18feaa9f930dfed51fee76411ee659ed8f961c0e5ba664878c1e WHIRLPOOL cdddaaf9b94806952c83a84abe596420d1c8065afb10da9b8d97acdd12b66a552de022d0f80081066e2c35f32aea3b1c7601dee09a5910c559188359bbdef502
diff --git a/dev-python/multipledispatch/metadata.xml b/dev-python/multipledispatch/metadata.xml
index 77e2d5017f0d..67abf67d3c53 100644
--- a/dev-python/multipledispatch/metadata.xml
+++ b/dev-python/multipledispatch/metadata.xml
@@ -1,11 +1,18 @@
-
- python@gentoo.org
- Python
-
-
- multipledispatch
-
+
+ python@gentoo.org
+ Python
+
+
+ A relatively sane approach to multiple dispatch in Python. This
+ implementation of multiple dispatch is efficient, mostly complete,
+ performs static analysis to avoid conflicts, and provides optional
+ namespace support.
+
+
+ multipledispatch
+ mrocklin/multipledispatch
+
diff --git a/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
new file mode 100644
index 000000000000..1e6c2fb23429
--- /dev/null
+++ b/dev-python/multipledispatch/multipledispatch-0.4.9.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} pypy )
+
+inherit distutils-r1
+
+DESCRIPTION="RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2"
+HOMEPAGE="https://multiple-dispatch.readthedocs.io/en/latest/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+RDEPEND=""
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/dev-python/numba/Manifest b/dev-python/numba/Manifest
index 05eccfd7fe47..49a98913bbc6 100644
--- a/dev-python/numba/Manifest
+++ b/dev-python/numba/Manifest
@@ -7,3 +7,4 @@ DIST numba-0.24.0.tar.gz 1134646 SHA256 623fa32a9e0018dcbffb3e5ab29c87a12252e67e
DIST numba-0.25.0.tar.gz 1180078 SHA256 a5e6c4d3a1b7c99b69c41d2af2894e631dff9809cc6c3c851f956920608c8602 SHA512 c9b2f9cb93b63fc8bfc0f5964be22d6da5df80d27f1f3df690cfc293f6c51e483053dbd9bcc38938be690b66ef14eea969fdf84120e4cebc108d58b8344e67c5 WHIRLPOOL ea28a872cf6ac03178058a463cdc1f44470578b673c08612e7cdca4951f6dc38c94c11743d1761bba8c4edf577f37a86b3dc208f0bfdcc600bbe517cff5c9e90
DIST numba-0.26.0.tar.gz 1219317 SHA256 56abeadd00e2867d1cbb360131e28d9d45f0ca3d0270cbf1be357e864d756642 SHA512 9cb05cf5a059ac79bba5cac0fd49d7356d0733500bf23b17ad86fa14ed5f7758e97e5f6d32e34d89d48328179924668e370c0380c602f57a1ddcbbbc8dfa4403 WHIRLPOOL 73b609bc0bd6c000e93ef37e842846a4174aa34ad34f7ef72c0c7b524a3731b6eaa13be9ef83f581853feebfe0ee219d13cd386b064fa4ede824410f0a82eb5c
DIST numba-0.27.0.tar.gz 1247144 SHA256 aa75fc2ac7d958d4ac84ad55b279dd95ee5e6ffd247fdcf04800f167731184ca SHA512 3c84fa58bc5e84683b5e593b99f8c48cfc6e9fd0f41a2a18d8a4d9deba618cec1e764a0202bb71166cbeebf27b908044be29e3b183b01f31edc8e85c962df876 WHIRLPOOL 178ec9ddaf5d2a9594eb808350d5e96a8b78ef643595aa6d02d581a7cfb7c86ae4902fccade874244a286957a9d9f4708c89d48d2c914a3528b9abae9db181b2
+DIST numba-0.30.0.tar.gz 1502870 SHA256 ce582c4b41d3444e5fb3a4dcc0a98ed7204e55781a7b67ad6d29796344651efb SHA512 c0ebd601de653e5a9744070f1502235aa2aaa97912f78d647d7b6b695c944c0946a2a64ef05985776f694bde0312fd27cb43b6c94d85419ca76bd12ebcff0dda WHIRLPOOL 659a24041be93d8b02629614e2ba3eeaccb37e47f414dab761c24f8a420408607553917eecb96c99eb63953b1b19d2c121963bd3c2df8082be908a4d6a104c3b
diff --git a/dev-python/numba/numba-0.27.0.ebuild b/dev-python/numba/numba-0.27.0.ebuild
index a0a805d1221d..d09256b7fda4 100644
--- a/dev-python/numba/numba-0.27.0.ebuild
+++ b/dev-python/numba/numba-0.27.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc examples test"
RDEPEND="
diff --git a/dev-python/numba/numba-0.30.0.ebuild b/dev-python/numba/numba-0.30.0.ebuild
new file mode 100644
index 000000000000..5798de58f5b5
--- /dev/null
+++ b/dev-python/numba/numba-0.30.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+PYTHON_COMPAT=( python{2_7,3_4,3_5} )
+
+inherit distutils-r1
+
+DESCRIPTION="NumPy aware dynamic Python compiler using LLVM"
+HOMEPAGE="http://numba.pydata.org/"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples test"
+
+RDEPEND="
+ >=dev-python/llvmlite-0.15[${PYTHON_USEDEP}]
+ >=dev-python/numpy-1.7[${PYTHON_USEDEP}]
+ virtual/python-enum34[${PYTHON_USEDEP}]
+ virtual/python-funcsigs[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+ test? ( virtual/python-singledispatch[${PYTHON_USEDEP}] )
+"
+# doc building highly broken
+
+python_test() {
+ cd "${BUILD_DIR}"/lib* || die
+ ${PYTHON} -c "import numba; numba.test()" || die
+}
+
+python_install_all() {
+ use examples && local EXAMPLES=( examples/. )
+ distutils-r1_python_install_all
+}
diff --git a/dev-python/odo/odo-0.5.0.ebuild b/dev-python/odo/odo-0.5.0.ebuild
index 6830f1d31b06..7fcefcb34df3 100644
--- a/dev-python/odo/odo-0.5.0.ebuild
+++ b/dev-python/odo/odo-0.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
IUSE="doc"
DEPEND="app-arch/unzip
diff --git a/dev-python/partd/partd-0.3.2.ebuild b/dev-python/partd/partd-0.3.2.ebuild
index 2116a4e86b92..03e8a0fa7784 100644
--- a/dev-python/partd/partd-0.3.2.ebuild
+++ b/dev-python/partd/partd-0.3.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="BSD"
SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~x86 ~amd64-linux ~x86-linux"
IUSE="doc test"
RDEPEND="dev-python/locket[${PYTHON_USEDEP}]"
diff --git a/dev-util/meson/meson-0.36.0.ebuild b/dev-util/meson/meson-0.36.0.ebuild
index 2d7ef8973b45..434f110c80cb 100644
--- a/dev-util/meson/meson-0.36.0.ebuild
+++ b/dev-util/meson/meson-0.36.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
LICENSE="Apache-2.0"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
IUSE=""
DEPEND="${PYTHON_DEPS}
diff --git a/gnome-extra/evolution-data-server/Manifest b/gnome-extra/evolution-data-server/Manifest
index d846688cbef1..42fff6058f5e 100644
--- a/gnome-extra/evolution-data-server/Manifest
+++ b/gnome-extra/evolution-data-server/Manifest
@@ -1,4 +1,3 @@
DIST evolution-data-server-3.20.5.tar.xz 5067732 SHA256 0d1586cd326d997497a2a6fddd939a83892be07cb20f8c88fda5013f8c5bbe7e SHA512 8376331ae0ee96013d5c61b1da92393486d0eb9e0fed63199d4b6c28d92cb6d9dc45826fd65b476d894141d507742e8574168bc99b8704bebe8b39bbd297606e WHIRLPOOL 3c3417603bd2a18c7a3370e32af7f1581fc399ebe6f721d0ac678a5978d667b58df2927eb02f240b4c2f139133e06f25e13a47879b7b7a470cd1283a186bba10
DIST evolution-data-server-3.20.6.tar.xz 5069584 SHA256 c9280149477cc0c75c20214814cfc54f0e5827c40080dadbbe4b4188479913aa SHA512 0526e64c407bd569b8fb45faeb902cdc15e46e5020c4187d76102f8e0b3173fdd0a742383cfed8de0351dd719c2ad33b39c7d4cd656312d07526ae8b85198dbc WHIRLPOOL e229d245ae79c6ecc2910bc6f110314e568d6afc546157af4e2a98be85e67ac1615f4085f3a4df2a94e658881ef6aa1c6d336b4ae3211bd0a85b2a81eef64f91
-DIST evolution-data-server-3.22.2.tar.xz 5558204 SHA256 c0498e0968a60c3e42d5f72416c6e36752bced73bb530aa028dbd0008efd2167 SHA512 08ef1a0fbdca01ecbb253077443ffe04700a9443c5ace572bf7e14ad527cb27e2fe686481e4113c82d8ae0069ea8dec013650b9e948840b569bfac2e41812ed1 WHIRLPOOL f5e8c9ffe1dfc6722e1872d991f014b29cbb24a387159cbb87c588e80bd2c6e436ee2e77aefe032f5cbd5b707abeff00040ce2d383ddedab796aff68e5cd3dc9
DIST evolution-data-server-3.22.3.tar.xz 5558616 SHA256 0c58dfc2bdd72ea5bef65e2ef9f2969c8ceef253d3e3150a894647a00d69cf4f SHA512 17a8cb07cc516925a8cc27798d61935ddd0de2074f7a245283aec8932cd1f023c2c0cd5339b5896984656a560865017ea9df9d77e80deb7fc1f432a82f5ba935 WHIRLPOOL f0ccfcf0080b785c5d35fd2afe072922c9538a10a60666459171e2b9d79e42ee30be2dd766abe1ffdca026a1f9f43b1764b60fc3dc1d5453bc3f55ce863ed36b
diff --git a/gnome-extra/evolution-data-server/evolution-data-server-3.22.2.ebuild b/gnome-extra/evolution-data-server/evolution-data-server-3.22.2.ebuild
deleted file mode 100644
index fa33e59fa6b1..000000000000
--- a/gnome-extra/evolution-data-server/evolution-data-server-3.22.2.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-PYTHON_COMPAT=( python2_7 python3_{4,5} pypy )
-VALA_USE_DEPEND="vapigen"
-
-inherit db-use flag-o-matic gnome2 python-any-r1 systemd vala virtualx
-
-DESCRIPTION="Evolution groupware backend"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) BSD Sleepycat"
-SLOT="0/59" # subslot = libcamel-1.2 soname version
-
-IUSE="api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather"
-REQUIRED_USE="vala? ( introspection )"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris"
-
-# sys-libs/db is only required for migrating from <3.13 versions
-# gdata-0.15.1 is required for google tasks
-# berkdb needed only for migrating old calendar data, bug #519512
-RDEPEND="
- >=app-crypt/gcr-3.4
- >=app-crypt/libsecret-0.5[crypt]
- >=dev-db/sqlite-3.7.17:=
- >=dev-libs/glib-2.46:2
- >=dev-libs/libgdata-0.10:=
- >=dev-libs/libical-0.43:=
- >=dev-libs/libxml2-2
- >=dev-libs/nspr-4.4:=
- >=dev-libs/nss-3.9:=
- >=net-libs/libsoup-2.42:2.4
-
- dev-libs/icu:=
- sys-libs/zlib:=
- virtual/libiconv
-
- berkdb? ( >=sys-libs/db-4:= )
- gtk? (
- >=app-crypt/gcr-3.4[gtk]
- >=x11-libs/gtk+-3.10:3
- )
- google? (
- >=dev-libs/json-glib-1.0.4
- >=dev-libs/libgdata-0.15.1:=
- >=net-libs/webkit-gtk-2.11.91:4
- )
- gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= )
- introspection? ( >=dev-libs/gobject-introspection-0.9.12:= )
- kerberos? ( virtual/krb5:= )
- ldap? ( >=net-nds/openldap-2:= )
- weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- dev-util/gdbus-codegen
- dev-util/gperf
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.35.5
- >=gnome-base/gnome-common-2
- >=sys-devel/gettext-0.17
- virtual/pkgconfig
- vala? ( $(vala_depend) )
-"
-
-# Some tests fail due to missings locales.
-# Also, dbus tests are flacky, bugs #397975 #501834
-# It looks like a nightmare to disable those for now.
-RESTRICT="test"
-
-pkg_setup() {
- python-any-r1_pkg_setup
-}
-
-src_prepare() {
- use vala && vala_src_prepare
- gnome2_src_prepare
-}
-
-src_configure() {
- # /usr/include/db.h is always db-1 on FreeBSD
- # so include the right dir in CPPFLAGS
- use berkdb && append-cppflags "-I$(db_includedir)"
-
- # phonenumber does not exist in tree
- gnome2_src_configure \
- $(use_enable api-doc-extras gtk-doc) \
- $(use_with api-doc-extras private-docs) \
- $(usex berkdb --with-libdb="${EPREFIX}"/usr --with-libdb=no) \
- $(use_enable gnome-online-accounts goa) \
- $(use_enable gtk) \
- $(use_enable google google-auth) \
- $(use_enable google) \
- $(use_enable introspection) \
- $(use_enable ipv6) \
- $(use_with kerberos krb5 "${EPREFIX}"/usr) \
- $(use_with kerberos krb5-libs "${EPREFIX}"/usr/$(get_libdir)) \
- $(use_with ldap openldap) \
- $(use_enable vala vala-bindings) \
- $(use_enable weather) \
- --enable-largefile \
- --enable-smime \
- --with-systemduserunitdir="$(systemd_get_userunitdir)" \
- --without-phonenumber \
- --disable-examples \
- --disable-uoa
-}
-
-src_test() {
- unset ORBIT_SOCKETDIR
- unset SESSION_MANAGER
- virtx emake check
-}
-
-src_install() {
- gnome2_src_install
-
- if use ldap; then
- insinto /etc/openldap/schema
- doins "${FILESDIR}"/calentry.schema
- dosym /usr/share/${PN}/evolutionperson.schema /etc/openldap/schema/evolutionperson.schema
- fi
-}
diff --git a/mail-client/evolution/Manifest b/mail-client/evolution/Manifest
index e82801524cdb..8f94fe986ff3 100644
--- a/mail-client/evolution/Manifest
+++ b/mail-client/evolution/Manifest
@@ -1,4 +1,2 @@
DIST evolution-3.20.5.tar.xz 12133872 SHA256 2e13551ce0996963506f0bdde5e01c3b8aa0622849a272ff12877cd595baeb6e SHA512 4b974ac5d8f3918a8012192634e8d131b1f6af0ed40a32181eb9500bc43b8bf4cf29a6fc7e49620638ada8f2456117e263e6162f21c0e1deef81861789a97906 WHIRLPOOL 1ed38bd2b9de97ad50bb832e03b76bf94131e65f0cf05c555d9e62d0e908467382b7e879d8eeb9513a6a09396da77eb2b2ac3a0dd3b97c6f2cde373dd65222ae
-DIST evolution-3.22.1.tar.xz 12257260 SHA256 fa652d830f4185c33666770e6e9cfcc39d5e2f09486bbd63a084f3527064e52e SHA512 7306605160fd39999ec8c710f65f4cdadd18b19e5b354748e896d0f3a381fc387b7c6017407db69acb681f67e944d15459d31bf9bd392e7c6071610e0be6d1b9 WHIRLPOOL 183c837ed6629c0fbe858cb8423f03a889db2398c2b4c060346628f111daeee1142ec2f53b12a25f5937e1af36b8002a36abed497236423d4ad19a07891b4643
-DIST evolution-3.22.2.tar.xz 12265296 SHA256 670e4cb620d30a57480c7c6f4cfe4e3bef6175a6dddadb2a8607f3532a693d34 SHA512 8727c7b1d0c9480825451d6813863d2f664a606fdbc8a353cc027a58533b30adeecd1bf804ad2ba1cec384bf3d5cbaedfd1c99e810a2e47882f10770df0c422f WHIRLPOOL 8e05fcfa987d1ad443c1b962cc9b07ec0565b30a45647101af67ffbd73245a674b83b156cd18f8b9ed740d54e9bf7c167c19422c3f3c658ad3a04fe75485adb7
DIST evolution-3.22.3.tar.xz 12269980 SHA256 a7328b0f225e41654643514eefafb02e6819660fd989ec1e8feab4f17e93dc00 SHA512 33d31d8c7dff30e026280fddc599085c1f9d0624e9c3ed95d9815787a48aebefc198b1bb2cb4bab75d283120c72275144ba4f158e8d82a6055c60dcd02b6addc WHIRLPOOL 2e89b65d40f97597e7554fffe235b9477b6529b5eba73fbcb61b53bfd72515ca32c52f55585431ad4b122d14d5be29ea863536ba045dcbbfeb72a181e88301ac
diff --git a/mail-client/evolution/evolution-3.22.1.ebuild b/mail-client/evolution/evolution-3.22.1.ebuild
deleted file mode 100644
index 4324cf88ae45..000000000000
--- a/mail-client/evolution/evolution-3.22.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="+bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# gnome-autoar (currently disabled because no release has been made)
-COMMON_DEPEND="
- >=app-crypt/gcr-3.4:=
- >=app-text/enchant-1.1.7
- >=dev-libs/glib-2.46:2[dbus]
- >=dev-libs/libxml2-2.7.3:2
- >=gnome-base/gnome-desktop-2.91.3:3=
- >=gnome-base/gsettings-desktop-schemas-2.91.92
- >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
- >=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/libsoup-2.42:2.4
- >=net-libs/webkit-gtk-2.13.90:4
- >=x11-libs/cairo-1.9.15:=[glib]
- >=x11-libs/gdk-pixbuf-2.24:2
- >=x11-libs/gtk+-3.10:3
- >=x11-libs/libnotify-0.7:=
- >=x11-misc/shared-mime-info-0.22
-
- >=app-text/iso-codes-0.49
- dev-libs/atk
- gnome-base/dconf
- dev-libs/libical:=
- x11-libs/libSM
- x11-libs/libICE
-
- crypt? (
- >=app-crypt/gnupg-1.4
- ${PINENTRY_DEPEND}
- x11-libs/libcryptui )
- geolocation? (
- >=media-libs/libchamplain-0.12:0.12[gtk]
- >=media-libs/clutter-1.0.0:1.0
- >=media-libs/clutter-gtk-0.90:1.0
- >=sci-geosciences/geocode-glib-3.10.0
- x11-libs/mx:1.0 )
- ldap? ( >=net-nds/openldap-2:= )
- spell? ( app-text/gtkspell:3 )
- ssl? (
- >=dev-libs/nspr-4.6.1:=
- >=dev-libs/nss-3.11:= )
- weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=gnome-base/gnome-common-2.12
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- bogofilter? ( mail-filter/bogofilter )
- highlight? ( app-text/highlight )
- spamassassin? ( mail-filter/spamassassin )
- !gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_configure() {
- # Use NSS/NSPR only if 'ssl' is enabled.
- gnome2_src_configure \
- --without-glade-catalog \
- --disable-autoar \
- --disable-code-coverage \
- --disable-installed-tests \
- --disable-pst-import \
- --enable-canberra \
- $(use_enable crypt libcryptui) \
- $(use_enable highlight text-highlight) \
- $(use_enable geolocation contact-maps) \
- $(use_enable spell gtkspell) \
- $(use_enable ssl nss) \
- $(use_enable ssl smime) \
- $(use_with bogofilter) \
- $(use_with ldap openldap) \
- $(use_with spamassassin) \
- $(usex ssl --enable-nss=yes "--without-nspr-libs
- --without-nspr-includes
- --without-nss-libs
- --without-nss-includes") \
- $(use_enable weather)
-}
-
-src_install() {
- gnome2_src_install
-
- # Problems with prelink:
- # https://bugzilla.gnome.org/show_bug.cgi?id=731680
- # https://bugzilla.gnome.org/show_bug.cgi?id=732148
- # https://bugzilla.redhat.com/show_bug.cgi?id=1114538
- echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
- doenvd "${T}"/99${PN}
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/mail-client/evolution/evolution-3.22.2.ebuild b/mail-client/evolution/evolution-3.22.2.ebuild
deleted file mode 100644
index 4324cf88ae45..000000000000
--- a/mail-client/evolution/evolution-3.22.2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-GNOME2_LA_PUNT="yes"
-
-inherit gnome2 flag-o-matic readme.gentoo-r1
-
-DESCRIPTION="Integrated mail, addressbook and calendaring functionality"
-HOMEPAGE="https://wiki.gnome.org/Apps/Evolution"
-
-# Note: explicitly "|| ( LGPL-2 LGPL-3 )", not "LGPL-2+".
-LICENSE="|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP"
-SLOT="2.0"
-
-IUSE="+bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather"
-
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd"
-
-# We need a graphical pinentry frontend to be able to ask for the GPG
-# password from inside evolution, bug 160302
-PINENTRY_DEPEND="|| ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] )"
-
-# glade-3 support is for maintainers only per configure.ac
-# pst is not mature enough and changes API/ABI frequently
-# dconf explicitely needed for backup plugin
-# gnome-desktop support is optional with --enable-gnome-desktop
-# gnome-autoar (currently disabled because no release has been made)
-COMMON_DEPEND="
- >=app-crypt/gcr-3.4:=
- >=app-text/enchant-1.1.7
- >=dev-libs/glib-2.46:2[dbus]
- >=dev-libs/libxml2-2.7.3:2
- >=gnome-base/gnome-desktop-2.91.3:3=
- >=gnome-base/gsettings-desktop-schemas-2.91.92
- >=gnome-extra/evolution-data-server-${PV}:=[gtk,weather?]
- >=media-libs/libcanberra-0.25[gtk3]
- >=net-libs/libsoup-2.42:2.4
- >=net-libs/webkit-gtk-2.13.90:4
- >=x11-libs/cairo-1.9.15:=[glib]
- >=x11-libs/gdk-pixbuf-2.24:2
- >=x11-libs/gtk+-3.10:3
- >=x11-libs/libnotify-0.7:=
- >=x11-misc/shared-mime-info-0.22
-
- >=app-text/iso-codes-0.49
- dev-libs/atk
- gnome-base/dconf
- dev-libs/libical:=
- x11-libs/libSM
- x11-libs/libICE
-
- crypt? (
- >=app-crypt/gnupg-1.4
- ${PINENTRY_DEPEND}
- x11-libs/libcryptui )
- geolocation? (
- >=media-libs/libchamplain-0.12:0.12[gtk]
- >=media-libs/clutter-1.0.0:1.0
- >=media-libs/clutter-gtk-0.90:1.0
- >=sci-geosciences/geocode-glib-3.10.0
- x11-libs/mx:1.0 )
- ldap? ( >=net-nds/openldap-2:= )
- spell? ( app-text/gtkspell:3 )
- ssl? (
- >=dev-libs/nspr-4.6.1:=
- >=dev-libs/nss-3.11:= )
- weather? ( >=dev-libs/libgweather-3.10:2= )
-"
-DEPEND="${COMMON_DEPEND}
- app-text/docbook-xml-dtd:4.1.2
- app-text/yelp-tools
- >=dev-util/gtk-doc-am-1.14
- >=dev-util/intltool-0.40.0
- >=gnome-base/gnome-common-2.12
- virtual/pkgconfig
-"
-RDEPEND="${COMMON_DEPEND}
- bogofilter? ( mail-filter/bogofilter )
- highlight? ( app-text/highlight )
- spamassassin? ( mail-filter/spamassassin )
- !gnome-extra/evolution-exchange
-"
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="To change the default browser if you are not using GNOME, edit
-~/.local/share/applications/mimeapps.list so it includes the
-following content:
-
-[Default Applications]
-x-scheme-handler/http=firefox.desktop
-x-scheme-handler/https=firefox.desktop
-
-(replace firefox.desktop with the name of the appropriate .desktop
-file from /usr/share/applications if you use a different browser)."
-
-src_configure() {
- # Use NSS/NSPR only if 'ssl' is enabled.
- gnome2_src_configure \
- --without-glade-catalog \
- --disable-autoar \
- --disable-code-coverage \
- --disable-installed-tests \
- --disable-pst-import \
- --enable-canberra \
- $(use_enable crypt libcryptui) \
- $(use_enable highlight text-highlight) \
- $(use_enable geolocation contact-maps) \
- $(use_enable spell gtkspell) \
- $(use_enable ssl nss) \
- $(use_enable ssl smime) \
- $(use_with bogofilter) \
- $(use_with ldap openldap) \
- $(use_with spamassassin) \
- $(usex ssl --enable-nss=yes "--without-nspr-libs
- --without-nspr-includes
- --without-nss-libs
- --without-nss-includes") \
- $(use_enable weather)
-}
-
-src_install() {
- gnome2_src_install
-
- # Problems with prelink:
- # https://bugzilla.gnome.org/show_bug.cgi?id=731680
- # https://bugzilla.gnome.org/show_bug.cgi?id=732148
- # https://bugzilla.redhat.com/show_bug.cgi?id=1114538
- echo PRELINK_PATH_MASK=/usr/bin/evolution > ${T}/99${PN}
- doenvd "${T}"/99${PN}
-
- readme.gentoo_create_doc
-}
-
-pkg_postinst() {
- gnome2_pkg_postinst
- readme.gentoo_print_elog
-}
diff --git a/media-libs/gegl/files/gegl-0.2.0-underlinking.patch b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
new file mode 100644
index 000000000000..4468f387855a
--- /dev/null
+++ b/media-libs/gegl/files/gegl-0.2.0-underlinking.patch
@@ -0,0 +1,38 @@
+From db19965ad957edee3c2ef3e321c3904b436749da Mon Sep 17 00:00:00 2001
+From: Sebastian Pipping
+Date: Mon, 9 Jan 2017 21:38:42 +0100
+Subject: [PATCH] Backport $(MATH_LIB) patch to GEGL 0.2
+
+Source:
+https://git.gnome.org/browse/gegl/patch/?id=c9bbc815378cb81ba8a48be35f615e7e2d74dffc
+---
+ bin/Makefile.am | 2 +-
+ examples/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/bin/Makefile.am b/bin/Makefile.am
+index c85ecbd..08a156b 100644
+--- a/bin/Makefile.am
++++ b/bin/Makefile.am
+@@ -23,7 +23,7 @@ AM_CFLAGS = \
+
+ AM_LDFLAGS = \
+ $(no_undefined) ../gegl/libgegl-$(GEGL_API_VERSION).la \
+- $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO)
++ $(DEP_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(LIBSPIRO) $(MATH_LIB)
+
+ bin_PROGRAMS = gegl
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index c29a1dd..5c4ac3a 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -42,4 +42,4 @@ AM_CFLAGS = $(DEP_CFLAGS) $(GTK_CFLAGS) $(BABL_CFLAGS) $(PNG_CFLAGS)
+
+ AM_LDFLAGS = \
+ $(top_builddir)/gegl/libgegl-$(GEGL_API_VERSION).la \
+- $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS)
++ $(DEP_LIBS) $(GTK_LIBS) $(BABL_LIBS) $(PNG_LIBS) $(MATH_LIB)
+--
+2.11.0
+
diff --git a/media-libs/gegl/gegl-0.2.0-r2.ebuild b/media-libs/gegl/gegl-0.2.0-r2.ebuild
index fec143cd220e..2e8582abb163 100644
--- a/media-libs/gegl/gegl-0.2.0-r2.ebuild
+++ b/media-libs/gegl/gegl-0.2.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -72,6 +72,9 @@ src_prepare() {
fi
epatch "${FILESDIR}"/${P}-g_log_domain.patch
+
+ # https://bugs.gentoo.org/show_bug.cgi?id=605216
+ epatch "${FILESDIR}"/${P}-underlinking.patch
eautoreconf
# https://bugs.gentoo.org/show_bug.cgi?id=468248
diff --git a/media-plugins/mythplugins/mythplugins-0.27.6_p20160318.ebuild b/media-plugins/mythplugins/mythplugins-0.27.6_p20160318.ebuild
index fc34d6595366..91818e059a0d 100644
--- a/media-plugins/mythplugins/mythplugins-0.27.6_p20160318.ebuild
+++ b/media-plugins/mythplugins/mythplugins-0.27.6_p20160318.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/MythTV/mythtv/archive/${BACKPORTS}.tar.gz -> mythtv-
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
MYTHPLUGINS="+mytharchive +mythbrowser +mythgallery +mythgame \
+mythmusic +mythnetvision +mythnews +mythweather +mythzoneminder"
diff --git a/media-radio/fldigi/Manifest b/media-radio/fldigi/Manifest
index 7267c13527a3..b36cb5a7ec93 100644
--- a/media-radio/fldigi/Manifest
+++ b/media-radio/fldigi/Manifest
@@ -5,3 +5,4 @@ DIST fldigi-3.23.16.tar.gz 3155189 SHA256 e9ad95191a1b2ec92936c589b181eac92fbbb5
DIST fldigi-3.23.17.tar.gz 3204908 SHA256 ea10f993fbda5bba8d21283e301bc4b650d3093a3f35c1505a50d6479c386c5b SHA512 362e57e14fa1a05ea4fdd2415996117af47878c37beb4d63e2d4ab57ca7f20e0b47c49b69bf35fcd7a8e7558c1e6329785087c8bcfcf8b8958f197af3c8381bb WHIRLPOOL 14ae37cfa99a8968f9169972944edc57b731f6a110669472573e4181dab59ab40c8ab69f887aec38f00c13c07eb6856fad857ccc572384d15bc9f0a2b2f66130
DIST fldigi-3.23.18.tar.gz 3211821 SHA256 39cd8459c3425326e998b740c96bc9b7351dea0a84f308e84d77cf050f0a7f30 SHA512 7dbe8d404c77c36724776afe3b1d7f5b96dfcddded746d8fe786c06ae67d50d897166534aa295a8d63487fbc00c0ebf89b780cdb4f0a526714c0a0b9c64544b2 WHIRLPOOL 4212bc07922c790b088d0d7d307281a06e9d5968c546c337ab3b84491732ba6e1030bfd544bbea750e2fdffa668ca0f2792b451cceae7a2e7e72f8fa519ff2f0
DIST fldigi-3.23.19.tar.gz 3213970 SHA256 099d52eee57fbe5562ac0bc351a7bfc39668623c3e0e3573995f1e345dfb0ae9 SHA512 0761800347a12493e2025e653db9dc52ea60611118ac3904f50f060f0d27c3c9a35f189e69f2ee1c3eb133ab9cd41a67dae2f033e36641568ce5c19ce07f8ec0 WHIRLPOOL c1352b5e693609642645655884ad105980338d153a434a30c317da971c13bb403848fa5d105224a32eb7e4af6adea41d9c76e57aefdef8d6270b86e21e4cf346
+DIST fldigi-3.23.20.tar.gz 3215903 SHA256 97b5489c4e428ed707aaf6c05a7b46874339031a8e9b24e50f4818c15435fce9 SHA512 78c2d85eb8fb091f386c4680a8928635a8e81e97175755446dc30a7934a5caf96adacd8ab3722275bc7557913cb9372004c98e265dc46222ba3a54090187fc25 WHIRLPOOL d3e524a25c26f9b2856486d22ce4813fe70aee14a6cd9f7e2f27c882104367cc10d1668ebe5cb3cd511f3868e7840e2c1b7c594d5c20fb7b50985768b97d51da
diff --git a/media-radio/fldigi/fldigi-3.23.20.ebuild b/media-radio/fldigi/fldigi-3.23.20.ebuild
new file mode 100644
index 000000000000..4929e55852ab
--- /dev/null
+++ b/media-radio/fldigi/fldigi-3.23.20.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+
+DESCRIPTION="Sound card based multimode software modem for Amateur Radio use"
+HOMEPAGE="http://www.w1hkj.com/Fldigi.html"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="hamlib nls portaudio pulseaudio sndfile"
+
+RDEPEND="x11-libs/fltk:1[threads,xft]
+ media-libs/libsamplerate
+ media-libs/libpng:0
+ x11-misc/xdg-utils
+ dev-perl/RPC-XML
+ dev-perl/Term-ReadLine-Perl
+ hamlib? ( media-libs/hamlib )
+ portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+ pulseaudio? ( media-sound/pulseaudio )
+ sndfile? ( >=media-libs/libsndfile-1.0.10 )"
+DEPEND="${RDEPEND}
+ nls? ( sys-devel/gettext )
+ virtual/pkgconfig"
+
+DOCS=( AUTHORS ChangeLog NEWS README )
+
+src_configure() {
+ econf $(use_with sndfile) \
+ $(use_with portaudio) \
+ $(use_with hamlib) \
+ $(use_enable nls) \
+ $(use_with pulseaudio) \
+ --without-asciidoc
+}
diff --git a/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild
index 75fccdd80eb2..e7c56178a08f 100644
--- a/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild
+++ b/media-video/mkvtoolnix/mkvtoolnix-9.6.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="http://www.bunkus.org/videotools/mkvtoolnix/sources/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux"
IUSE="curl debug pch test qt5"
ruby_atom() {
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index a7a928999dfd..28b4e73dd4db 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2017 21:13:11 +0000
+Tue, 10 Jan 2017 06:43:11 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index a7a928999dfd..28b4e73dd4db 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2017 21:13:11 +0000
+Tue, 10 Jan 2017 06:43:11 +0000
diff --git a/metadata/md5-cache/app-admin/keepass-2.35 b/metadata/md5-cache/app-admin/keepass-2.35
new file mode 100644
index 000000000000..5bb16191897a
--- /dev/null
+++ b/metadata/md5-cache/app-admin/keepass-2.35
@@ -0,0 +1,13 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare
+DEPEND=dev-lang/mono app-arch/unzip >=sys-apps/sed-4
+DESCRIPTION=A free, open source, light-weight and easy-to-use password manager
+EAPI=6
+HOMEPAGE=http://keepass.info/
+IUSE=aot
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2
+RDEPEND=dev-lang/mono dev-dotnet/libgdiplus[cairo]
+SLOT=0
+SRC_URI=mirror://sourceforge/keepass/KeePass-2.35-Source.zip
+_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=5d92f2dc25cd5fffd1a032bf20f75327
diff --git a/metadata/md5-cache/app-arch/bloscpack-0.11.0 b/metadata/md5-cache/app-arch/bloscpack-0.11.0
new file mode 100644
index 000000000000..ab9ddc30b878
--- /dev/null
+++ b/metadata/md5-cache/app-arch/bloscpack-0.11.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Command line interface for Blosc compression
+EAPI=6
+HOMEPAGE=https://github.com/Blosc/bloscpack
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-python/blosc[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/bloscpack/bloscpack-0.11.0.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=336c765f8022e8a0465dce33f0cd91e0
diff --git a/metadata/md5-cache/app-misc/i2bits-0.0.2 b/metadata/md5-cache/app-misc/i2bits-0.0.2
new file mode 100644
index 000000000000..369da71fb022
--- /dev/null
+++ b/metadata/md5-cache/app-misc/i2bits-0.0.2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=sys-devel/make >=dev-util/cmake-3.5.2
+DESCRIPTION=Utility to convert hex or dec to binary format
+EAPI=6
+HOMEPAGE=https://bitbucket.org/PascalRD/i2bits/
+KEYWORDS=~amd64 ~x86
+LICENSE=WTFPL-2
+SLOT=0
+SRC_URI=http://unixdev.ru/src/i2bits-0.0.2.tar.gz
+_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=72a19170b37c902539891e8de2848517
diff --git a/metadata/md5-cache/app-misc/ranger-1.8.1 b/metadata/md5-cache/app-misc/ranger-1.8.1
new file mode 100644
index 000000000000..1d5165115bd1
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ranger-1.8.1
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=A vim-inspired file manager for the console
+EAPI=6
+HOMEPAGE=http://ranger.nongnu.org/
+IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-3
+RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=http://nongnu.org/ranger/ranger-1.8.1.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=2f44fba325a05eab438ae9fdc6358c49
diff --git a/metadata/md5-cache/app-misc/ranger-9999 b/metadata/md5-cache/app-misc/ranger-9999
index ea3f35cc3397..d80aea992b50 100644
--- a/metadata/md5-cache/app-misc/ranger-9999
+++ b/metadata/md5-cache/app-misc/ranger-9999
@@ -9,4 +9,4 @@ RDEPEND=virtual/pager python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 git-r3 e928b84a9f6f1d9076d1d27687876dc6 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ae9b41d6ad44155ba9ea7b3ad3e1b999
+_md5_=2f44fba325a05eab438ae9fdc6358c49
diff --git a/metadata/md5-cache/app-officeext/ooofbtools-2.48 b/metadata/md5-cache/app-officeext/ooofbtools-2.48
index c33830206b1c..c5730c2e0222 100644
--- a/metadata/md5-cache/app-officeext/ooofbtools-2.48
+++ b/metadata/md5-cache/app-officeext/ooofbtools-2.48
@@ -4,11 +4,11 @@ DESCRIPTION=OpenOffice extension for the FictionBook2 format with validation
EAPI=5
HOMEPAGE=https://sourceforge.net/projects/fbtools/
IUSE=office_implementation_libreoffice office_implementation_openoffice
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-3
RDEPEND=dev-libs/libxml2 app-arch/zip office_implementation_libreoffice? ( || ( app-office/libreoffice app-office/libreoffice-bin ) ) office_implementation_openoffice? ( app-office/openoffice-bin )
REQUIRED_USE=|| ( office_implementation_libreoffice office_implementation_openoffice )
SLOT=0
SRC_URI=mirror://sourceforge/fbtools/files/release/OOoFBTools-2.48.zip
_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 office-ext-r1 342fc56feaa095aba175303656869008 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=a32b7b859d625ac90f37c29d48f3c3d4
+_md5_=3e20276b4d564d079de384c48842aef8
diff --git a/metadata/md5-cache/app-shells/bash-4.3_p48 b/metadata/md5-cache/app-shells/bash-4.3_p48
deleted file mode 100644
index 83dd86726fb6..000000000000
--- a/metadata/md5-cache/app-shells/bash-4.3_p48
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst preinst prepare setup unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) virtual/yacc
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=5
-HOMEPAGE=http://tiswww.case.edu/php/chet/bash/bashtop.html
-IUSE=afs bashlogger examples mem-scramble +net nls plugins +readline
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.2-r2:0= readline? ( >=sys-libs/readline-6.3:0= ) nls? ( virtual/libintl ) !=dev-libs/libplatform-2.0.0 raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] ) python? ( dev-lang/swig ) virtual/pkgconfig sys-devel/make >=dev-util/cmake-3.5.2
+DESCRIPTION=Library for communicating with the Pulse-Eight USB HDMI-CEC Adaptor
+EAPI=6
+HOMEPAGE=http://libcec.pulse-eight.com
+IUSE=cubox exynos python raspberry-pi +xrandr python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=GPL-2
+RDEPEND=virtual/udev >=dev-libs/libplatform-2.0.0 raspberry-pi? ( >=media-libs/raspberrypi-userland-0_pre20160305-r1 ) xrandr? ( x11-libs/libXrandr ) python? ( python_single_target_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_single_target_python3_4? ( dev-lang/python:3.4 ) python_single_target_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_jython2_7(-),-python_single_target_pypy(-),-python_single_target_pypy3(-),python_single_target_python2_7(+)?,python_single_target_python3_4(+)?,python_single_target_python3_5(+)?] )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python2_7 python_single_target_python3_4 python_single_target_python3_5 ) python_single_target_python2_7? ( python_targets_python2_7 ) python_single_target_python3_4? ( python_targets_python3_4 ) python_single_target_python3_5? ( python_targets_python3_5 ) )
+SLOT=0
+SRC_URI=https://github.com/Pulse-Eight/libcec/archive/libcec-4.0.1.tar.gz
+_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
+_md5_=4a1241cbeedfd93187ea7ab640391ab6
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.6.5 b/metadata/md5-cache/dev-libs/libdynd-0.6.5
deleted file mode 100644
index 02c58d577d2f..000000000000
--- a/metadata/md5-cache/dev-libs/libdynd-0.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=C++ dynamic multi-dimensionnal array library with Python exposure
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/libdynd
-IUSE=cuda doc fftw test
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
-SLOT=0/0.6.5
-SRC_URI=https://github.com/ContinuumIO/libdynd/archive/v0.6.5.tar.gz -> libdynd-0.6.5.tar.gz
-_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 cuda f150e667cc5826799d86be0fff518252 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ad8414e12a0a320208835e4c4ebd874
diff --git a/metadata/md5-cache/dev-libs/libdynd-0.6.6 b/metadata/md5-cache/dev-libs/libdynd-0.7.2
similarity index 52%
rename from metadata/md5-cache/dev-libs/libdynd-0.6.6
rename to metadata/md5-cache/dev-libs/libdynd-0.7.2
index 2cb15f741ca4..171a56883fa2 100644
--- a/metadata/md5-cache/dev-libs/libdynd-0.6.6
+++ b/metadata/md5-cache/dev-libs/libdynd-0.7.2
@@ -1,13 +1,13 @@
DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) sys-devel/make >=dev-util/cmake-3.5.2
+DEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 ) doc? ( app-doc/doxygen[dot] ) sys-devel/make >=dev-util/cmake-3.5.2
DESCRIPTION=C++ dynamic multi-dimensionnal array library with Python exposure
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/libdynd
-IUSE=cuda doc fftw test
+EAPI=6
+HOMEPAGE=http://libdynd.org
+IUSE=cuda doc fftw mkl test
KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
-RDEPEND=dev-libs/c-blosc:0= cuda? ( x11-drivers/nvidia-drivers dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
-SLOT=0/0.6.6
-SRC_URI=https://github.com/ContinuumIO/libdynd/archive/v0.6.6.tar.gz -> libdynd-0.6.6.tar.gz
+RDEPEND=dev-libs/c-blosc:0= cuda? ( dev-util/nvidia-cuda-toolkit ) fftw? ( sci-libs/fftw:3.0 )
+SLOT=0/0.7.2
+SRC_URI=https://github.com/libdynd/libdynd/archive/v0.7.2.tar.gz -> libdynd-0.7.2.tar.gz
_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 cuda f150e667cc5826799d86be0fff518252 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=fbf27ee1d7017120028fb97b53f1bfdc
+_md5_=9356d500eac6ef7652a6bd9fc700c88b
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.8 b/metadata/md5-cache/dev-libs/pugixml-1.8
index 0da8f486980f..0dba57b7ed2b 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.8
+++ b/metadata/md5-cache/dev-libs/pugixml-1.8
@@ -3,9 +3,9 @@ DEPEND=sys-devel/make >=dev-util/cmake-3.5.2
DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
EAPI=6
HOMEPAGE=http://pugixml.org/ https://github.com/zeux/pugixml/
-KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=MIT
SLOT=0
SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.8/pugixml-1.8.tar.gz
_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=b44d49b7efb687de9873934989f5bb5a
+_md5_=72762dd10551bf3e43fbc47ef8506d30
diff --git a/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1 b/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
new file mode 100644
index 000000000000..dd328998db2e
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-Net_DNSBL-1.3.7-r1
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install
+DESCRIPTION=PHP library to query DNS blacklists
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/Net_DNSBL
+IUSE=examples
+KEYWORDS=~alpha ~amd64 ~hppa ~ia64 ~sparc ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-lang/php:* dev-php/PEAR-Cache_Lite dev-php/PEAR-HTTP_Request2 dev-php/PEAR-Net_DNS dev-php/PEAR-PEAR examples? ( dev-lang/php:*[cli] dev-php/PEAR-Console_Getopt )
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/Net_DNSBL-1.3.7.tgz
+_md5_=f6b3b7d1bfdef46515d855b108febe2f
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r1 b/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r1
deleted file mode 100644
index 98044baaf2cc..000000000000
--- a/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r1
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=install postinst setup
-DEPEND=dev-lang/php[tokenizer] dev-lang/php:* >=dev-php/pear-1.8.1
-DESCRIPTION=Code Beautifier for PHP
-EAPI=5
-HOMEPAGE=http://pear.php.net/PHP_Beautifier
-KEYWORDS=~amd64 ~x86
-LICENSE=PHP-3
-RDEPEND=dev-lang/php[tokenizer] >=dev-php/PEAR-Log-1.8 dev-lang/php:* >=dev-php/pear-1.8.1
-SLOT=0
-SRC_URI=http://pear.php.net/get/PHP_Beautifier-0.1.15.tgz
-_eclasses_=multilib 165fc17c38d1b11dac2008280dab6e80 php-pear-r1 7d1434952f2d1483feac6ad812d605dd toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=8f180cee6ffc6010469d3b5e56b8d2c7
diff --git a/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2 b/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
new file mode 100644
index 000000000000..2bc686803ca1
--- /dev/null
+++ b/metadata/md5-cache/dev-php/PEAR-PHP_Beautifier-0.1.15-r2
@@ -0,0 +1,11 @@
+DEFINED_PHASES=install prepare
+DESCRIPTION=Code Beautifier for PHP
+EAPI=6
+HOMEPAGE=http://pear.php.net/package/PHP_Beautifier
+IUSE=cli examples
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=dev-lang/php:*[bzip2,cli?,tokenizer] dev-php/PEAR-Archive_Tar dev-php/PEAR-Log dev-php/PEAR-PEAR cli? ( dev-php/PEAR-Console_Getopt )
+SLOT=0
+SRC_URI=http://download.pear.php.net/package/PHP_Beautifier-0.1.15.tgz
+_md5_=b422e5c45960eb1a38ea91260a7be602
diff --git a/metadata/md5-cache/dev-python/bcolz-0.12.1 b/metadata/md5-cache/dev-python/bcolz-0.12.1
index 775cd28ef610..92fa5429acf3 100644
--- a/metadata/md5-cache/dev-python/bcolz-0.12.1
+++ b/metadata/md5-cache/dev-python/bcolz-0.12.1
@@ -4,11 +4,11 @@ DESCRIPTION=Provides columnar and compressed data containers
EAPI=5
HOMEPAGE=https://github.com/Blosc/bcolz
IUSE=doc test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND=>=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/numexpr-1.4.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
SLOT=0
SRC_URI=mirror://pypi/b/bcolz/bcolz-0.12.1.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=759f4b98735d8d88a31ba8b9126ec270
+_md5_=dc1534ea86fdd970cf1bbb5e5e05a213
diff --git a/metadata/md5-cache/dev-python/blaze-0.10.2 b/metadata/md5-cache/dev-python/blaze-0.10.2
index 3f98db5a263f..8a1dc7e88aaa 100644
--- a/metadata/md5-cache/dev-python/blaze-0.10.2
+++ b/metadata/md5-cache/dev-python/blaze-0.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=Next generation Python numpy
EAPI=5
HOMEPAGE=http://blaze.pydata.org/
IUSE=examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/datashape[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/dynd-python-0.6.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pyparsing[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cytoolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pandas-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/h5py[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/unicodecsv[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/requests[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/flask-0.10.1[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/flask-cors[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/sqlalchemy-0.8.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pytables-3.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pymongo-2.8[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/xlrd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/into[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numba[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/bcolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/odo-0.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=https://github.com/ContinuumIO/blaze/archive/0.10.2.tar.gz -> blaze-0.10.2.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=8157f45819e90dd7064b66a3511564d2
+_md5_=77786437368723bd971ac043b9ebe50c
diff --git a/metadata/md5-cache/dev-python/blosc-1.2.8 b/metadata/md5-cache/dev-python/blosc-1.2.8
index a968287a4311..cc53dc85e162 100644
--- a/metadata/md5-cache/dev-python/blosc-1.2.8
+++ b/metadata/md5-cache/dev-python/blosc-1.2.8
@@ -4,11 +4,11 @@ DESCRIPTION=High performance compressor optimized for binary data
EAPI=5
HOMEPAGE=http://python-blosc.blosc.org https://github.com/Blosc/python-blosc
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=MIT
RDEPEND=>=dev-libs/c-blosc-1.3.5 python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/b/blosc/blosc-1.2.8.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=66351880e8063bc0a589b9d890ab952f
+_md5_=ee60bb5cca476978f719d75e3e772b4b
diff --git a/metadata/md5-cache/dev-python/blosc-1.4.4 b/metadata/md5-cache/dev-python/blosc-1.4.4
new file mode 100644
index 000000000000..6af280c3967e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/blosc-1.4.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-libs/c-blosc:= dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=High performance compressor optimized for binary data
+EAPI=6
+HOMEPAGE=http://python-blosc.blosc.org
+IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=dev-libs/c-blosc:= python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/b/blosc/blosc-1.4.4.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=e9c8b2237c856c99b8d3fbbf272292fc
diff --git a/metadata/md5-cache/dev-python/dask-0.10.2 b/metadata/md5-cache/dev-python/dask-0.10.2
index 277f2faa125d..4736a09fc4ce 100644
--- a/metadata/md5-cache/dev-python/dask-0.10.2
+++ b/metadata/md5-cache/dev-python/dask-0.10.2
@@ -4,11 +4,11 @@ DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
EAPI=6
HOMEPAGE=http://dask.pydata.org/
IUSE=test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/bokeh[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cloudpickle[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pandas[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/partd[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/psutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/d/dask/dask-0.10.2.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=cae6b8cc9e8495db65a3b510c4a3363a
+_md5_=2d580c8529d40f7a461549c278e29e9b
diff --git a/metadata/md5-cache/dev-python/datashape-0.5.4 b/metadata/md5-cache/dev-python/datashape-0.5.4
new file mode 100644
index 000000000000..f91c7160f2f7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/datashape-0.5.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=doc? ( >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/mock[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/pytest[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Language defining a data description protocol
+EAPI=6
+HOMEPAGE=https://github.com/ContinuumIO/datashape
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/python-dateutil[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/ContinuumIO/datashape/archive/0.5.4.tar.gz -> datashape-0.5.4.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=3d8e3df8252b9190ced27259c99edae2
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.6.5 b/metadata/md5-cache/dev-python/dynd-python-0.6.5
deleted file mode 100644
index 49b6925225dc..000000000000
--- a/metadata/md5-cache/dev-python/dynd-python-0.6.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/libdynd-0.6.5 >=dev-python/numpy-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/cython-0.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Python exposure of multidimensionnal array library libdynd
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/dynd-python
-IUSE=doc test python_targets_python2_7 python_targets_python3_4
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=~dev-libs/libdynd-0.6.5 >=dev-python/numpy-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/dynd-python/archive/v0.6.5.tar.gz -> dynd-python-0.6.5.tar.gz
-_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=36995ee091be1683330e1c3f92a968df
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.6.6 b/metadata/md5-cache/dev-python/dynd-python-0.6.6
deleted file mode 100644
index d5679f2390e0..000000000000
--- a/metadata/md5-cache/dev-python/dynd-python-0.6.6
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-libs/libdynd-0.6.6 >=dev-python/numpy-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/cython-0.19[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) sys-devel/make >=dev-util/cmake-3.5.2
-DESCRIPTION=Python exposure of multidimensionnal array library libdynd
-EAPI=5
-HOMEPAGE=https://github.com/ContinuumIO/dynd-python
-IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=~dev-libs/libdynd-0.6.6 >=dev-python/numpy-1.5[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-SLOT=0
-SRC_URI=https://github.com/ContinuumIO/dynd-python/archive/v0.6.6.tar.gz -> dynd-python-0.6.6.tar.gz
-_eclasses_=cmake-utils fa4d8052a1ccf4fbbfa76361bffebe42 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=9458dd0a86938d24bb63d5513410b4c7
diff --git a/metadata/md5-cache/dev-python/dynd-python-0.7.2 b/metadata/md5-cache/dev-python/dynd-python-0.7.2
new file mode 100644
index 000000000000..4e8007afcde9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dynd-python-0.7.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-libs/libdynd-0.7.2 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/cython[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] doc? ( dev-python/sphinx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) test? ( dev-python/nose[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=Python exposure of multidimensionnal array library libdynd
+EAPI=6
+HOMEPAGE=http://libdynd.org/
+IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=~dev-libs/libdynd-0.7.2 dev-python/numpy[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/libdynd/dynd-python/archive/v0.7.2.tar.gz -> dynd-python-0.7.2.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=f64c8cbee691af7456d4f84b7a9cdb2d
diff --git a/metadata/md5-cache/dev-python/flask-cors-2.1.0 b/metadata/md5-cache/dev-python/flask-cors-2.1.0
index 1989da1b3184..c27436e5ef9e 100644
--- a/metadata/md5-cache/dev-python/flask-cors-2.1.0
+++ b/metadata/md5-cache/dev-python/flask-cors-2.1.0
@@ -4,11 +4,11 @@ DESCRIPTION=A Flask extension for Cross Origin Resource Sharing (CORS)
EAPI=5
HOMEPAGE=https://github.com/wcdolphin/flask-cors https://pypi.python.org/pypi/Flask-Cors
IUSE=doc test python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=MIT
RDEPEND=dev-python/flask[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/six[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/F/Flask-Cors/Flask-Cors-2.1.0.tar.gz -> flask-cors-2.1.0.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b26f2b4024651311e2690c458d751d86
+_md5_=1d241b5f3d2da1754b20f2ff21c4c695
diff --git a/metadata/md5-cache/dev-python/locket-0.2.0 b/metadata/md5-cache/dev-python/locket-0.2.0
index fd095a58c8a7..038908738ef6 100644
--- a/metadata/md5-cache/dev-python/locket-0.2.0
+++ b/metadata/md5-cache/dev-python/locket-0.2.0
@@ -4,11 +4,11 @@ DESCRIPTION=File-based locks for Python
EAPI=6
HOMEPAGE=https://github.com/mwilliamson/locket.py
IUSE=python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/l/locket/locket-0.2.0.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=11e61dcaf43d74fbe98c48bd8cc37a56
+_md5_=15bbe6e98a7d0f156272a20f9baf306c
diff --git a/metadata/md5-cache/dev-python/multipledispatch-0.4.9 b/metadata/md5-cache/dev-python/multipledispatch-0.4.9
new file mode 100644
index 000000000000..15c6e43c9453
--- /dev/null
+++ b/metadata/md5-cache/dev-python/multipledispatch-0.4.9
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-python/setuptools[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=RESTful HTTP Content Negotiation for Flask, Bottle, web.py and webapp2
+EAPI=6
+HOMEPAGE=https://multiple-dispatch.readthedocs.io/en/latest/
+IUSE=python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=python_targets_pypy? ( virtual/pypy:0= ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_pypy(-)?,python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_pypy(-),-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_pypy python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=mirror://pypi/m/multipledispatch/multipledispatch-0.4.9.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=7fe9b72d99aa8464e5baf1f299efedd0
diff --git a/metadata/md5-cache/dev-python/numba-0.27.0 b/metadata/md5-cache/dev-python/numba-0.27.0
index 87e128a00d9c..ef9713ac3e22 100644
--- a/metadata/md5-cache/dev-python/numba-0.27.0
+++ b/metadata/md5-cache/dev-python/numba-0.27.0
@@ -4,11 +4,11 @@ DESCRIPTION=NumPy aware dynamic Python compiler using LLVM
EAPI=5
HOMEPAGE=http://numba.pydata.org/
IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND=>=dev-python/llvmlite-0.10[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.6[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( dev-python/enum34[python_targets_python2_7(-)?,-python_single_target_python2_7(-)] ) virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=https://github.com/numba/numba/archive/0.27.0.tar.gz -> numba-0.27.0.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=c92b4e7063c4442fab6a1e6cda12f970
+_md5_=a7ae3c02b004484138102f5bbd33bea0
diff --git a/metadata/md5-cache/dev-python/numba-0.30.0 b/metadata/md5-cache/dev-python/numba-0.30.0
new file mode 100644
index 000000000000..dde8e859f201
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numba-0.30.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/llvmlite-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] test? ( virtual/python-singledispatch[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+DESCRIPTION=NumPy aware dynamic Python compiler using LLVM
+EAPI=6
+HOMEPAGE=http://numba.pydata.org/
+IUSE=doc examples test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/llvmlite-0.15[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-enum34[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] virtual/python-funcsigs[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
+REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
+SLOT=0
+SRC_URI=https://github.com/numba/numba/archive/0.30.0.tar.gz -> numba-0.30.0.tar.gz
+_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
+_md5_=041fd0ee150c95873dbc106272ebf59e
diff --git a/metadata/md5-cache/dev-python/odo-0.5.0 b/metadata/md5-cache/dev-python/odo-0.5.0
index 8f04cd6c05b7..19b9b6beaf43 100644
--- a/metadata/md5-cache/dev-python/odo-0.5.0
+++ b/metadata/md5-cache/dev-python/odo-0.5.0
@@ -4,11 +4,11 @@ DESCRIPTION=Data migration in python
EAPI=5
HOMEPAGE=https://github.com/ContinuumIO/odo
IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=BSD
RDEPEND=>=dev-python/datashape-0.4.4[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/numpy-1.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/pandas-0.15.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/toolz[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/multipledispatch-0.4.7[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] dev-python/networkx[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/o/odo/odo-0.5.0.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=07c4c8b88039d1c5d61d6b959b61cd10
+_md5_=3829ffa670b4360d3aacc0a27d8f7f36
diff --git a/metadata/md5-cache/dev-python/partd-0.3.2 b/metadata/md5-cache/dev-python/partd-0.3.2
index 806e83a23b38..70acbe2f3f7a 100644
--- a/metadata/md5-cache/dev-python/partd-0.3.2
+++ b/metadata/md5-cache/dev-python/partd-0.3.2
@@ -4,11 +4,11 @@ DESCRIPTION=Appendable key-value storage
EAPI=6
HOMEPAGE=https://github.com/dask/partd/
IUSE=doc test python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~x86 ~amd64-linux ~x86-linux
LICENSE=BSD
RDEPEND=dev-python/locket[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7 ) python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/p/partd/partd-0.3.2.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3b914376244cc4c4a1fece73355d2d4a
+_md5_=412b8f33eff4c32a31a0e317ebcac05d
diff --git a/metadata/md5-cache/dev-util/meson-0.36.0 b/metadata/md5-cache/dev-util/meson-0.36.0
index 892227f04873..115faa0728ec 100644
--- a/metadata/md5-cache/dev-util/meson-0.36.0
+++ b/metadata/md5-cache/dev-util/meson-0.36.0
@@ -4,11 +4,11 @@ DESCRIPTION=Open source build system
EAPI=6
HOMEPAGE=http://mesonbuild.com/
IUSE=python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
LICENSE=Apache-2.0
RDEPEND=python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-util/ninja-1.6.0 python_targets_python3_4? ( dev-lang/python:3.4 ) python_targets_python3_5? ( dev-lang/python:3.5 ) >=dev-lang/python-exec-2:=[python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/m/meson/meson-0.36.0.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=d50282cd0f595dd7689428985c8ad672
+_md5_=9d3116aa1da0ffbb3752eb57aedbc7c1
diff --git a/metadata/md5-cache/gnome-extra/evolution-data-server-3.22.2 b/metadata/md5-cache/gnome-extra/evolution-data-server-3.22.2
deleted file mode 100644
index c078e58899e2..000000000000
--- a/metadata/md5-cache/gnome-extra/evolution-data-server-3.22.2
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=dev-libs/libgdata-0.15.1:= >=net-libs/webkit-gtk-2.11.91:4 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) || ( dev-lang/python:3.5 dev-lang/python:3.4 >=dev-lang/python-2.7.5-r2:2.7 virtual/pypy:0 ) dev-util/gdbus-codegen dev-util/gperf >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.35.5 >=gnome-base/gnome-common-2 >=sys-devel/gettext-0.17 virtual/pkgconfig vala? ( || ( dev-lang/vala:0.34[vapigen(+)] dev-lang/vala:0.32[vapigen(+)] dev-lang/vala:0.30[vapigen(+)] dev-lang/vala:0.28[vapigen(+)] dev-lang/vala:0.26[vapigen(+)] ) ) app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=Evolution groupware backend
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=api-doc-extras berkdb +gnome-online-accounts +gtk google +introspection ipv6 ldap kerberos vala +weather test
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd ~x86-freebsd ~amd64-linux ~ia64-linux ~x86-linux ~x86-solaris
-LICENSE=|| ( LGPL-2 LGPL-3 ) BSD Sleepycat
-RDEPEND=>=app-crypt/gcr-3.4 >=app-crypt/libsecret-0.5[crypt] >=dev-db/sqlite-3.7.17:= >=dev-libs/glib-2.46:2 >=dev-libs/libgdata-0.10:= >=dev-libs/libical-0.43:= >=dev-libs/libxml2-2 >=dev-libs/nspr-4.4:= >=dev-libs/nss-3.9:= >=net-libs/libsoup-2.42:2.4 dev-libs/icu:= sys-libs/zlib:= virtual/libiconv berkdb? ( >=sys-libs/db-4:= ) gtk? ( >=app-crypt/gcr-3.4[gtk] >=x11-libs/gtk+-3.10:3 ) google? ( >=dev-libs/json-glib-1.0.4 >=dev-libs/libgdata-0.15.1:= >=net-libs/webkit-gtk-2.11.91:4 ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.8:= ) introspection? ( >=dev-libs/gobject-introspection-0.9.12:= ) kerberos? ( virtual/krb5:= ) ldap? ( >=net-nds/openldap-2:= ) weather? ( >=dev-libs/libgweather-3.10:2= )
-REQUIRED_USE=vala? ( introspection )
-RESTRICT=test
-SLOT=0/59
-SRC_URI=mirror://gnome/sources/evolution-data-server/3.22/evolution-data-server-3.22.2.tar.xz
-_eclasses_=db-use a4966c7f4f7df444ead1212848c13cc9 eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 python-any-r1 1c20f9b800324335a8e3b137363362e8 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 vala ca3f1c504058f5de407febddfae73167 versionator 99ae9d758cbe7cfed19170e7d48f5a9c virtualx 86c9305a59b3e0459e7fbef3a5f30b96 xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=3e78b11cdd1abf1b9f3918868ad2304a
diff --git a/metadata/md5-cache/mail-client/evolution-3.22.1 b/metadata/md5-cache/mail-client/evolution-3.22.1
deleted file mode 100644
index 3869d0157a37..000000000000
--- a/metadata/md5-cache/mail-client/evolution-3.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-crypt/gcr-3.4:= >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.22.1:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=gnome-base/gnome-common-2.12 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Integrated mail, addressbook and calendaring functionality
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=+bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-crypt/gcr-3.4:= >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.22.1:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
-SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.22/evolution-3.22.1.tar.xz
-_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ff667fad2209d8e9f5d01d2af9c076d4
diff --git a/metadata/md5-cache/mail-client/evolution-3.22.2 b/metadata/md5-cache/mail-client/evolution-3.22.2
deleted file mode 100644
index 0ca844cfb95b..000000000000
--- a/metadata/md5-cache/mail-client/evolution-3.22.2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare
-DEPEND=>=app-crypt/gcr-3.4:= >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.22.2:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) app-text/docbook-xml-dtd:4.1.2 app-text/yelp-tools >=dev-util/gtk-doc-am-1.14 >=dev-util/intltool-0.40.0 >=gnome-base/gnome-common-2.12 virtual/pkgconfig app-arch/xz-utils >=sys-apps/sed-4 dev-util/desktop-file-utils x11-misc/shared-mime-info
-DESCRIPTION=Integrated mail, addressbook and calendaring functionality
-EAPI=6
-HOMEPAGE=https://wiki.gnome.org/Apps/Evolution
-IUSE=+bogofilter crypt geolocation highlight ldap spamassassin spell ssl +weather
-KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86 ~x86-fbsd
-LICENSE=|| ( LGPL-2 LGPL-3 ) CC-BY-SA-3.0 FDL-1.3+ OPENLDAP
-RDEPEND=>=app-crypt/gcr-3.4:= >=app-text/enchant-1.1.7 >=dev-libs/glib-2.46:2[dbus] >=dev-libs/libxml2-2.7.3:2 >=gnome-base/gnome-desktop-2.91.3:3= >=gnome-base/gsettings-desktop-schemas-2.91.92 >=gnome-extra/evolution-data-server-3.22.2:=[gtk,weather?] >=media-libs/libcanberra-0.25[gtk3] >=net-libs/libsoup-2.42:2.4 >=net-libs/webkit-gtk-2.13.90:4 >=x11-libs/cairo-1.9.15:=[glib] >=x11-libs/gdk-pixbuf-2.24:2 >=x11-libs/gtk+-3.10:3 >=x11-libs/libnotify-0.7:= >=x11-misc/shared-mime-info-0.22 >=app-text/iso-codes-0.49 dev-libs/atk gnome-base/dconf dev-libs/libical:= x11-libs/libSM x11-libs/libICE crypt? ( >=app-crypt/gnupg-1.4 || ( app-crypt/pinentry[gnome-keyring] app-crypt/pinentry[gtk] app-crypt/pinentry[qt4] app-crypt/pinentry[qt5] ) x11-libs/libcryptui ) geolocation? ( >=media-libs/libchamplain-0.12:0.12[gtk] >=media-libs/clutter-1.0.0:1.0 >=media-libs/clutter-gtk-0.90:1.0 >=sci-geosciences/geocode-glib-3.10.0 x11-libs/mx:1.0 ) ldap? ( >=net-nds/openldap-2:= ) spell? ( app-text/gtkspell:3 ) ssl? ( >=dev-libs/nspr-4.6.1:= >=dev-libs/nss-3.11:= ) weather? ( >=dev-libs/libgweather-3.10:2= ) bogofilter? ( mail-filter/bogofilter ) highlight? ( app-text/highlight ) spamassassin? ( mail-filter/spamassassin ) !gnome-extra/evolution-exchange
-SLOT=2.0
-SRC_URI=mirror://gnome/sources/evolution/3.22/evolution-3.22.2.tar.xz
-_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 gnome.org ad34f378a3d57a6f2f2b8b4aaca4543e gnome2 21c81ea94c12e45a63f7f14fba666e3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 readme.gentoo-r1 03878c06495db70bc36bd717383c09f7 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg a5c4c5ce4f5ce9a2e777f5d9a40a8723 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=ff667fad2209d8e9f5d01d2af9c076d4
diff --git a/metadata/md5-cache/media-libs/gegl-0.2.0-r2 b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
index a64dda4e8506..5a200f068d9f 100644
--- a/metadata/md5-cache/media-libs/gegl-0.2.0-r2
+++ b/metadata/md5-cache/media-libs/gegl-0.2.0-r2
@@ -10,4 +10,4 @@ RDEPEND=>=media-libs/babl-0.1.10 >=dev-libs/glib-2.28:2 >=x11-libs/gdk-pixbuf-2.
SLOT=0
SRC_URI=ftp://ftp.gimp.org/pub/gegl/0.2/gegl-0.2.0.tar.bz2
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=e48e6a67c11b9eaae35be66650484151
+_md5_=12d939301220db07fdef84e6453af460
diff --git a/metadata/md5-cache/media-plugins/mythplugins-0.27.6_p20160318 b/metadata/md5-cache/media-plugins/mythplugins-0.27.6_p20160318
index af47e6c7307f..d5e307311386 100644
--- a/metadata/md5-cache/media-plugins/mythplugins-0.27.6_p20160318
+++ b/metadata/md5-cache/media-plugins/mythplugins-0.27.6_p20160318
@@ -4,11 +4,11 @@ DESCRIPTION=Official MythTV plugins
EAPI=6
HOMEPAGE=http://www.mythtv.org
IUSE=+mytharchive +mythbrowser +mythgallery +mythgame +mythmusic +mythnetvision +mythnews +mythweather +mythzoneminder alsa cdda cdr exif fftw +hls ieee1394 libass raw +theora +vorbis +xml xvid python_targets_python2_7
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
LICENSE=GPL-2
RDEPEND=!media-plugins/mytharchive !media-plugins/mythbrowser !media-plugins/mythgallery !media-plugins/mythgame !media-plugins/mythmovies !media-plugins/mythmusic !media-plugins/mythnetvision !media-plugins/mythnews !media-plugins/mythweather ~media-tv/mythtv-0.27.6_p20160318:=[alsa=,hls=,ieee1394=,libass=,python,theora=,vorbis=,xml=,xvid=] dev-libs/glib:= xml? ( >=dev-libs/libxml2-2.6.0:= ) dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtopengl:4 dev-qt/qtsql:4 dev-libs/openssl:= alsa? ( >=media-libs/alsa-lib-1.0.24:= ) hls? ( media-libs/faac:= media-libs/libvpx:= >=media-libs/x264-0.0.20111220:= >=media-sound/lame-3.93.1 ) media-libs/freetype:= libass? ( >=media-libs/libass-0.9.11:= ) media-libs/libpng:= theora? ( media-libs/libtheora:= media-libs/libogg:= ) xvid? ( >=media-libs/xvid-1.1.0:= ) virtual/libudev:= ieee1394? ( >=sys-libs/libraw1394-1.2.0:= >=sys-libs/libavc1394-0.5.3:= >=media-libs/libiec61883-1.0.0:= ) x11-libs/libX11:= sys-libs/zlib:= x11-libs/libXext:= x11-libs/libXinerama:= x11-libs/libXrandr:= x11-libs/libXv:= x11-libs/libXxf86vm:= fftw? ( sci-libs/fftw:= ) sys-apps/util-linux:= mythzoneminder? ( virtual/mysql ) mytharchive? ( app-cdr/dvd+rw-tools dev-python/pillow:= media-video/dvdauthor media-video/mjpegtools[png] media-video/transcode virtual/cdrtools ) mythgallery? ( media-libs/tiff:= virtual/opengl exif? ( >media-libs/libexif-0.6.9:= ) raw? ( media-gfx/dcraw ) ) mythmusic? ( >=media-libs/flac-1.1.2:= >=media-libs/taglib-1.6:= >=media-libs/libvorbis-1.0:= media-libs/libogg:= >=media-sound/lame-3.93.1 virtual/opengl cdda? ( dev-libs/libcdio:= cdr? ( virtual/cdrtools ) ) ) mythnetvision? ( >=dev-lang/python-2.7.5-r2:2.7[xml] >=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_4(-),-python_single_target_python3_5(-),python_single_target_python2_7(+)] dev-python/lxml:= dev-python/mysql-python:= dev-python/oauth:= dev-python/pycurl:= ) mythweather? ( dev-perl/Date-Manip dev-perl/DateTime-Format-ISO8601 >=dev-perl/DateTime-1 dev-perl/Image-Size dev-perl/JSON dev-perl/SOAP-Lite dev-perl/XML-Simple dev-perl/XML-Parser dev-perl/XML-SAX dev-perl/XML-XPath ) mythbrowser? ( dev-qt/qtwebkit:4 )
REQUIRED_USE=cdda? ( mythmusic ) cdr? ( mythmusic cdda ) exif? ( mythgallery ) fftw? ( mythmusic ) mythmusic? ( vorbis ) mythnews? ( mythbrowser ) raw? ( mythgallery ) mythnetvision? ( python_targets_python2_7 )
SLOT=0
SRC_URI=https://github.com/MythTV/mythtv/archive/b6ae90c071a9a8eac9873fae988d5eb2434f3160.tar.gz -> mythtv-0.27.6_p20160318.tar.gz
_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 python-single-r1 19a74c6b5c191723a997dc7e0cc6bb09 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 vcs-snapshot 2b65ecb2d0f91e4322c2ac8d673993bd
-_md5_=3b5828bcf5081b74494511a18da79315
+_md5_=ef8415e475045de26d99407670ba1271
diff --git a/metadata/md5-cache/media-radio/fldigi-3.23.20 b/metadata/md5-cache/media-radio/fldigi-3.23.20
new file mode 100644
index 000000000000..bfde3e4198e0
--- /dev/null
+++ b/metadata/md5-cache/media-radio/fldigi-3.23.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure
+DEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 ) nls? ( sys-devel/gettext ) virtual/pkgconfig
+DESCRIPTION=Sound card based multimode software modem for Amateur Radio use
+EAPI=5
+HOMEPAGE=http://www.w1hkj.com/Fldigi.html
+IUSE=hamlib nls portaudio pulseaudio sndfile
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=x11-libs/fltk:1[threads,xft] media-libs/libsamplerate media-libs/libpng:0 x11-misc/xdg-utils dev-perl/RPC-XML dev-perl/Term-ReadLine-Perl hamlib? ( media-libs/hamlib ) portaudio? ( >=media-libs/portaudio-19_pre20071207 ) pulseaudio? ( media-sound/pulseaudio ) sndfile? ( >=media-libs/libsndfile-1.0.10 )
+SLOT=0
+SRC_URI=mirror://sourceforge/fldigi/fldigi-3.23.20.tar.gz
+_md5_=ae2ae114ff7f9a5ceac2f993983ec72c
diff --git a/metadata/md5-cache/media-video/mkvtoolnix-9.6.0 b/metadata/md5-cache/media-video/mkvtoolnix-9.6.0
index 56e60ea81904..4887b75d628b 100644
--- a/metadata/md5-cache/media-video/mkvtoolnix-9.6.0
+++ b/metadata/md5-cache/media-video/mkvtoolnix-9.6.0
@@ -4,10 +4,10 @@ DESCRIPTION=Tools to create, alter, and inspect Matroska files
EAPI=6
HOMEPAGE=http://www.bunkus.org/videotools/mkvtoolnix
IUSE=curl debug pch test qt5
-KEYWORDS=~amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~ppc ~ppc64 ~x86 ~x86-fbsd ~amd64-linux ~x86-linux
LICENSE=GPL-2
RDEPEND=>=dev-libs/boost-1.46.0:= >=dev-libs/libebml-1.3.3:= dev-libs/pugixml media-libs/flac >=media-libs/libmatroska-1.4.4:= media-libs/libogg media-libs/libvorbis sys-apps/file sys-libs/zlib qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 )
SLOT=0
SRC_URI=http://www.bunkus.org/videotools/mkvtoolnix/sources/mkvtoolnix-9.6.0.tar.xz
_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=f606c8351456fd4b3c3bd3146c45df47
+_md5_=07fc86f2f4909231d40580a0157eac0a
diff --git a/metadata/md5-cache/net-misc/chrony-2.4.1 b/metadata/md5-cache/net-misc/chrony-2.4.1
index 6b1fe45dbd44..d4f8faca68d6 100644
--- a/metadata/md5-cache/net-misc/chrony-2.4.1
+++ b/metadata/md5-cache/net-misc/chrony-2.4.1
@@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
EAPI=6
HOMEPAGE=http://chrony.tuxfamily.org/
IUSE=caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns
-KEYWORDS=~amd64 hppa ppc64
+KEYWORDS=~alpha ~amd64 hppa ppc64
LICENSE=GPL-2
RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
REQUIRED_USE=?? ( libedit readline )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://download.tuxfamily.org/chrony/chrony-2.4.1.tar.gz
_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=4d506c8b69af1f6311311793b9a6e078
+_md5_=16ff6e00c618c3fd67756bcc89f39284
diff --git a/metadata/md5-cache/net-misc/chrony-3.0_pre1 b/metadata/md5-cache/net-misc/chrony-3.0_pre1
deleted file mode 100644
index 4eb796407026..000000000000
--- a/metadata/md5-cache/net-misc/chrony-3.0_pre1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare
-DEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) html? ( dev-ruby/asciidoctor ) pps? ( net-misc/pps-tools ) virtual/pkgconfig
-DESCRIPTION=NTP client and server programs
-EAPI=6
-HOMEPAGE=http://chrony.tuxfamily.org/
-IUSE=caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns
-KEYWORDS=~amd64 ~hppa ~ppc64
-LICENSE=GPL-2
-RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
-REQUIRED_USE=?? ( libedit readline )
-RESTRICT=test
-SLOT=0
-SRC_URI=http://download.tuxfamily.org/chrony/chrony-3.0-pre1.tar.gz
-_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=8fac48ed97e94cd90c11cdb40afdbe22
diff --git a/metadata/md5-cache/net-misc/chrony-3.0_pre2 b/metadata/md5-cache/net-misc/chrony-3.0_pre2
index c7673a3f3f85..aa29136672c3 100644
--- a/metadata/md5-cache/net-misc/chrony-3.0_pre2
+++ b/metadata/md5-cache/net-misc/chrony-3.0_pre2
@@ -4,7 +4,7 @@ DESCRIPTION=NTP client and server programs
EAPI=6
HOMEPAGE=http://chrony.tuxfamily.org/
IUSE=caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns
-KEYWORDS=~amd64 ~hppa ~ppc64
+KEYWORDS=~alpha ~amd64 ~hppa ~ppc64
LICENSE=GPL-2
RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sys-libs/readline-4.1-r4:= ) selinux? ( sec-policy/selinux-chronyd )
REQUIRED_USE=?? ( libedit readline )
@@ -12,4 +12,4 @@ RESTRICT=test
SLOT=0
SRC_URI=http://download.tuxfamily.org/chrony/chrony-3.0-pre2.tar.gz
_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=8fac48ed97e94cd90c11cdb40afdbe22
+_md5_=0075d1bd49c4a15563255b2db71ae5b3
diff --git a/metadata/md5-cache/net-misc/chrony-2.4-r1 b/metadata/md5-cache/net-misc/chrony-3.0_pre3
similarity index 88%
rename from metadata/md5-cache/net-misc/chrony-2.4-r1
rename to metadata/md5-cache/net-misc/chrony-3.0_pre3
index 766604f6a788..5a6cfb2eca40 100644
--- a/metadata/md5-cache/net-misc/chrony-2.4-r1
+++ b/metadata/md5-cache/net-misc/chrony-3.0_pre3
@@ -10,6 +10,6 @@ RDEPEND=caps? ( sys-libs/libcap ) libedit? ( dev-libs/libedit ) readline? ( >=sy
REQUIRED_USE=?? ( libedit readline )
RESTRICT=test
SLOT=0
-SRC_URI=http://download.tuxfamily.org/chrony/chrony-2.4.tar.gz
+SRC_URI=http://download.tuxfamily.org/chrony/chrony-3.0-pre3.tar.gz
_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 multilib 165fc17c38d1b11dac2008280dab6e80 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=2746fadad4c2aa2ab3d9850cadd32dd0
+_md5_=0075d1bd49c4a15563255b2db71ae5b3
diff --git a/metadata/md5-cache/net-misc/openssh-7.2_p2 b/metadata/md5-cache/net-misc/openssh-7.2_p2
deleted file mode 100644
index 758ddcd73497..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.2_p2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=5
-HOMEPAGE=http://www.openssh.org/
-IUSE=bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl pam +pie sctp selinux skey ssh1 +ssl static X X509
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.2p2.tar.gz mirror://gentoo/openssh-7.2_p1-sctp.patch.xz ldap? ( mirror://gentoo/openssh-lpk-7.2p2-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-8.9/openssh-7.2p2+x509-8.9.diff.gz )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=6c609d5bef9d3954c1e4e59d3dbfba65
diff --git a/metadata/md5-cache/net-misc/openssh-7.2_p2-r1 b/metadata/md5-cache/net-misc/openssh-7.2_p2-r1
deleted file mode 100644
index 758e4e23ee63..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.2_p2-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=5
-HOMEPAGE=http://www.openssh.org/
-IUSE=bindist debug hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static X X509
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.2p2.tar.gz mirror://gentoo/openssh-7.2_p1-sctp.patch.xz ldap? ( mirror://gentoo/openssh-lpk-7.2p2-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-8.9/openssh-7.2p2+x509-8.9.diff.gz )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=c2fd556c6728257952d8fdd580615af4
diff --git a/metadata/md5-cache/net-misc/openssh-7.3_p1-r5 b/metadata/md5-cache/net-misc/openssh-7.3_p1-r5
deleted file mode 100644
index 700358174f3f..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.3_p1-r5
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=5
-HOMEPAGE=http://www.openssh.org/
-IUSE=bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=BSD GPL-2
-RDEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl ) test? ( ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.3p1.tar.gz mirror://gentoo/openssh-7.3_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.3_p1-hpn-14.10-r1.patch.xz http://dev.gentoo.org/~chutzpah/openssh-7.3_p1-hpn-14.10-r1.patch.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.3p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-9.2/openssh-7.3p1+x509-9.2.diff.gz )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=57698da8309ffedecd11683cdd6f8cd3
diff --git a/metadata/md5-cache/net-misc/openssh-7.3_p1-r6 b/metadata/md5-cache/net-misc/openssh-7.3_p1-r6
deleted file mode 100644
index bdd7af06f124..000000000000
--- a/metadata/md5-cache/net-misc/openssh-7.3_p1-r6
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst preinst prepare setup test
-DEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) static? ( ldns? ( net-libs/ldns[static-libs(+)] !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit[static-libs(+)] ) sctp? ( net-misc/lksctp-tools[static-libs(+)] ) selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] ) skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0[static-libs(+)] ) libressl? ( dev-libs/libressl[static-libs(+)] ) ) >=sys-libs/zlib-1.2.3[static-libs(+)] ) virtual/pkgconfig virtual/os-headers sys-devel/autoconf !=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DESCRIPTION=Port of OpenBSD's free SSH release
-EAPI=5
-HOMEPAGE=http://www.openssh.org/
-IUSE=bindist debug +hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static test X X509
-KEYWORDS=alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~hppa-hpux ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD GPL-2
-RDEPEND=!static? ( ldns? ( net-libs/ldns !bindist? ( net-libs/ldns[ecdsa,ssl] ) bindist? ( net-libs/ldns[-ecdsa,ssl] ) ) libedit? ( dev-libs/libedit ) sctp? ( net-misc/lksctp-tools ) selinux? ( >=sys-libs/libselinux-1.28 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( !libressl? ( >=dev-libs/openssl-0.9.8f:0[bindist=] dev-libs/openssl:0 ) libressl? ( dev-libs/libressl ) ) >=sys-libs/zlib-1.2.3 ) pam? ( virtual/pam ) kerberos? ( virtual/krb5 ) ldap? ( net-nds/openldap ) pam? ( >=sys-auth/pambase-20081028 ) userland_GNU? ( virtual/shadow ) X? ( x11-apps/xauth )
-REQUIRED_USE=ldns? ( ssl ) pie? ( !static ) ssh1? ( ssl ) static? ( !kerberos !pam ) X509? ( !ldap ssl ) test? ( ssl )
-SLOT=0
-SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-7.3p1.tar.gz mirror://gentoo/openssh-7.3_p1-sctp.patch.xz hpn? ( mirror://gentoo/openssh-7.3_p1-hpn-14.10-r1.patch.xz http://dev.gentoo.org/~chutzpah/openssh-7.3_p1-hpn-14.10-r1.patch.xz ) ldap? ( mirror://gentoo/openssh-lpk-7.3p1-0.3.14.patch.xz ) X509? ( http://roumenpetrov.info/openssh/x509-9.2/openssh-7.3p1+x509-9.2.diff.gz )
-_eclasses_=autotools 07e71b3b5690738ef7e8bc097077e00c eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 libtool 4890219c51da247200223277f993e054 multilib 165fc17c38d1b11dac2008280dab6e80 pam 3ecd5b75e39b0bb05a3183c08fcdfdb4 systemd 5b6ca8b2fc1307ca593223f327342c96 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 user 80aaa71614ced86f02ee1a513821dc87 versionator 99ae9d758cbe7cfed19170e7d48f5a9c
-_md5_=2ec9029515f7dd96e0ddc2e617222ddb
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.1-r2 b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.1-r2
deleted file mode 100644
index c547de266876..000000000000
--- a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare unpack
-DEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 >=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-2.92[cxx] ) libproxy? ( net-libs/libproxy ) qrcode? ( media-gfx/zbar ) >=dev-libs/boost-1.46 virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A Qt4 based map editor for the openstreetmap.org project
-EAPI=5
-HOMEPAGE=http://www.merkaartor.be https://github.com/openstreetmap/merkaartor
-IUSE=debug exif gps libproxy qrcode linguas_ar linguas_cs linguas_de linguas_es linguas_et linguas_fr linguas_hr linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sk linguas_sv linguas_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 >=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-2.92[cxx] ) libproxy? ( net-libs/libproxy ) qrcode? ( media-gfx/zbar )
-SLOT=0
-SRC_URI=https://github.com/openstreetmap/merkaartor/archive/0.18.1.tar.gz -> merkaartor-0.18.1.tar.gz
-_eclasses_=base 3fe4f8980633fd7bc69e9887209ba2fe eutils 017377e73405d964cd0137088cddb9c3 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 l10n e26ea0642846685782f1813642e7ff0f multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db qt4-r2 d6c113024bb3086a1facc65cd338930e toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=fa691b54372617d63ebae97cd79bc6ca
diff --git a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.2 b/metadata/md5-cache/sci-geosciences/merkaartor-0.18.2
deleted file mode 100644
index 025bf652247e..000000000000
--- a/metadata/md5-cache/sci-geosciences/merkaartor-0.18.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure postinst postrm preinst prepare
-DEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtconcurrent:5 dev-qt/qtprintsupport:5 ) >=dev-qt/qtsingleapplication-2.6.1[X,qt4?,qt5?] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.13[cxx] ) libproxy? ( net-libs/libproxy ) qrcode? ( media-gfx/zbar[qt4] ) virtual/pkgconfig >=sys-apps/sed-4
-DESCRIPTION=A Qt based map editor for the openstreetmap.org project
-EAPI=5
-HOMEPAGE=http://www.merkaartor.be https://github.com/openstreetmap/merkaartor
-IUSE=debug exif gps libproxy qrcode qt4 qt5 linguas_ar linguas_cs linguas_de linguas_es linguas_et linguas_fr linguas_hr linguas_hu linguas_it linguas_ja linguas_nl linguas_pl linguas_pt_BR linguas_pt linguas_ru linguas_sk linguas_sv linguas_uk
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=qt4? ( dev-qt/qtcore:4 dev-qt/qtgui:4 dev-qt/qtsvg:4 dev-qt/qtwebkit:4 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtsvg:5 dev-qt/qtwebkit:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 dev-qt/qtconcurrent:5 dev-qt/qtprintsupport:5 ) >=dev-qt/qtsingleapplication-2.6.1[X,qt4?,qt5?] >=sci-libs/gdal-1.6.0 >=sci-libs/proj-4.6 sys-libs/zlib exif? ( media-gfx/exiv2:= ) gps? ( >=sci-geosciences/gpsd-3.13[cxx] ) libproxy? ( net-libs/libproxy ) qrcode? ( media-gfx/zbar[qt4] )
-REQUIRED_USE=^^ ( qt4 qt5 ) qrcode? ( qt4 )
-SLOT=0
-SRC_URI=https://github.com/openstreetmap/merkaartor/archive/0.18.2.tar.gz -> merkaartor-0.18.2.tar.gz
-_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 fdo-mime 92d07846ea8ea54172f8c0112a47ae3d gnome2-utils c6dcdf3a2c22b578b16adb945dc85c35 l10n e26ea0642846685782f1813642e7ff0f multilib 165fc17c38d1b11dac2008280dab6e80 qmake-utils 0a242e7177789b0028b4045f336dd4db toolchain-funcs 1b1da0c45c555989dc5d832b54880783 xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=a01c396b1d0e78761fbdf50411844aca
diff --git a/metadata/md5-cache/sys-fs/dosfstools-3.0.28 b/metadata/md5-cache/sys-fs/dosfstools-3.0.28
deleted file mode 100644
index 6aa835b1ccc0..000000000000
--- a/metadata/md5-cache/sys-fs/dosfstools-3.0.28
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DESCRIPTION=DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat
-EAPI=5
-HOMEPAGE=https://github.com/dosfstools/dosfstools
-KEYWORDS=alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux
-LICENSE=GPL-3
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/dosfstools/dosfstools/releases/download/v3.0.28/dosfstools-3.0.28.tar.xz
-_eclasses_=eutils 017377e73405d964cd0137088cddb9c3 flag-o-matic 7366202dd55cb8f018f5d450d54e7749 multilib 165fc17c38d1b11dac2008280dab6e80 toolchain-funcs 1b1da0c45c555989dc5d832b54880783
-_md5_=b4b8b2bb5c7be2bef3393f8f3b66d89e
diff --git a/metadata/md5-cache/sys-process/glances-2.4.2 b/metadata/md5-cache/sys-process/glances-2.4.2
deleted file mode 100644
index e3e74c138c1b..000000000000
--- a/metadata/md5-cache/sys-process/glances-2.4.2
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-DESCRIPTION=CLI curses based monitoring tool
-EAPI=5
-HOMEPAGE=https://github.com/nicolargo/glances
-IUSE=chart doc hddtemp snmp web python_targets_python2_7 python_targets_python3_4
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] >=dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] hddtemp? ( app-admin/hddtemp ) snmp? ( dev-python/pysnmp[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) web? ( dev-python/bottle[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) chart? ( dev-python/matplotlib[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)] ) python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 )
-SLOT=0
-SRC_URI=mirror://pypi/G/Glances/Glances-2.4.2.tar.gz
-_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=915b0446e5fa5d126b7b62b4898f94d3
diff --git a/metadata/md5-cache/sys-process/glances-2.5.1 b/metadata/md5-cache/sys-process/glances-2.5.1
deleted file mode 100644
index 9ddbaef78611..000000000000
--- a/metadata/md5-cache/sys-process/glances-2.5.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=CLI curses based monitoring tool
-EAPI=5
-HOMEPAGE=https://github.com/nicolargo/glances
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/G/Glances/Glances-2.5.1.tar.gz
-_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=13c768e56f449509ce4053989e859379
diff --git a/metadata/md5-cache/sys-process/glances-2.6.1 b/metadata/md5-cache/sys-process/glances-2.6.1
deleted file mode 100644
index 42c44056e4c9..000000000000
--- a/metadata/md5-cache/sys-process/glances-2.6.1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=CLI curses based monitoring tool
-EAPI=6
-HOMEPAGE=https://github.com/nicolargo/glances
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/G/Glances/Glances-2.6.1.tar.gz
-_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=b2ba77243440506a93e189eca86ed4d3
diff --git a/metadata/md5-cache/sys-process/glances-2.7 b/metadata/md5-cache/sys-process/glances-2.7
deleted file mode 100644
index d988a4f25c52..000000000000
--- a/metadata/md5-cache/sys-process/glances-2.7
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-DESCRIPTION=CLI curses based monitoring tool
-EAPI=6
-HOMEPAGE=https://github.com/nicolargo/glances
-IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-3
-RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
-REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
-SLOT=0
-SRC_URI=mirror://pypi/G/Glances/Glances-2.7.tar.gz
-_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=54c92e3cfb992e5d62c58b3e2038ac36
diff --git a/metadata/md5-cache/sys-process/glances-2.7.1 b/metadata/md5-cache/sys-process/glances-2.7.1
index 0fec670b0260..65d9b2bde9ce 100644
--- a/metadata/md5-cache/sys-process/glances-2.7.1
+++ b/metadata/md5-cache/sys-process/glances-2.7.1
@@ -4,11 +4,11 @@ DESCRIPTION=CLI curses based monitoring tool
EAPI=6
HOMEPAGE=https://github.com/nicolargo/glances
IUSE=doc python_targets_python2_7 python_targets_python3_4 python_targets_python3_5
-KEYWORDS=~amd64 ~arm ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm x86 ~amd64-linux ~x86-linux
LICENSE=LGPL-3
RDEPEND=dev-python/setuptools[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] >=dev-python/psutil-2.0.0[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)] python_targets_python2_7? ( >=dev-lang/python-2.7.5-r2:2.7[ncurses] ) python_targets_python3_4? ( dev-lang/python:3.4[ncurses] ) python_targets_python3_5? ( dev-lang/python:3.5[ncurses] ) >=dev-lang/python-exec-2:=[python_targets_python2_7(-)?,python_targets_python3_4(-)?,python_targets_python3_5(-)?,-python_single_target_python2_7(-),-python_single_target_python3_4(-),-python_single_target_python3_5(-)]
REQUIRED_USE=|| ( python_targets_python2_7 python_targets_python3_4 python_targets_python3_5 )
SLOT=0
SRC_URI=mirror://pypi/G/Glances/Glances-2.7.1.tar.gz
_eclasses_=distutils-r1 583a05d30524485fda6869c772682ecd eutils 017377e73405d964cd0137088cddb9c3 linux-info af49d8ab3be91bb1d38b7201dc9e5123 multibuild 742139c87a9fa3766f0c2b155e5522bf multilib 165fc17c38d1b11dac2008280dab6e80 multiprocessing 66b3bf714f8cfc1b6494db5269b4666e python-r1 dcd61d7a5c283f18cfe763552b09eb88 python-utils-r1 d142329ab093dd20c1dd0edb5f094108 toolchain-funcs 1b1da0c45c555989dc5d832b54880783 versionator 99ae9d758cbe7cfed19170e7d48f5a9c xdg-utils e2b2bd56125ce8cf59ce30c642b59d48
-_md5_=54c92e3cfb992e5d62c58b3e2038ac36
+_md5_=b1bbf06589c9963d1c687e8ca1a34baa
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index a7a928999dfd..28b4e73dd4db 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2017 21:13:11 +0000
+Tue, 10 Jan 2017 06:43:11 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index 0d9761fced6b..07db7d80793b 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -4147,11 +4147,6 @@ developers and volunteer mentors.
Alexis Ballier
Member ( XdTV, gpac, other )
-
- idl0r@gentoo.org
- Christian Ruppert
- Member ( DVB, VDR, misc )
-
lordvan@gentoo.org
Thomas R
diff --git a/metadata/timestamp b/metadata/timestamp
index 860b764d37a8..dbb288f21a36 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Jan 9 21:09:24 UTC 2017
+Tue Jan 10 06:39:23 UTC 2017
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3a317cc6cac6..bbc3130dfb6c 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2017 21:30:02 +0000
+Tue, 10 Jan 2017 07:00:01 +0000
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index d2ccab0c0069..a689a6ccfb57 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1483996201 Mon 09 Jan 2017 09:10:01 PM UTC
+1484030401 Tue 10 Jan 2017 06:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index a7a928999dfd..28b4e73dd4db 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 09 Jan 2017 21:13:11 +0000
+Tue, 10 Jan 2017 06:43:11 +0000
diff --git a/net-im/licq/files/licq-1.3.8-hebrew.patch b/net-im/licq/files/licq-1.3.8-hebrew.patch
deleted file mode 100644
index a0fdb936bdb2..000000000000
--- a/net-im/licq/files/licq-1.3.8-hebrew.patch
+++ /dev/null
@@ -1,95 +0,0 @@
---- configure
-+++ configure
-@@ -3283,7 +3283,7 @@
-
- # Check whether --enable-hebrew was given.
- if test "${enable_hebrew+set}" = set; then :
-- enableval=$enable_hebrew; USE_HEBREW=yes
-+ enableval=$enable_hebrew; USE_HEBREW=$enableval
- else
- USE_HEBREW=no
- fi
---- src/hebrev.c
-+++ src/hebrev.c
-@@ -48,6 +48,7 @@
- short int mode = 0, imode;
- const char *hmark = NULL, *lmark, *nmark, *nlmark;
- char ch;
-+ const char* srcstart = src;
-
- if (src == NULL)
- return NULL;
-@@ -69,7 +70,7 @@
- if (*src == 0 || iseng(*src))
- {
- lmark = src-1;
-- while ((!isheb(*lmark)) && (!ispunct(*lmark))) lmark--;
-+ while (lmark > srcstart && !isheb(*lmark) && !ispunct(*lmark)) lmark--;
- src = lmark;
- imode = 0;
- nmark = NULL;
-@@ -114,6 +115,7 @@
- hmark = NULL;
- mode = 0;
- }
-+ if (*src == '\0') *dest = '\0';
- }
- if (!*src++)
- break;
-@@ -141,15 +143,16 @@
- char *temp=NULL, *tmp=NULL;
- char *arg=NULL, *arg2=NULL;
- int i=0;
-+ char* saveptr = NULL;
-
- temp = (char*) malloc(strlen(input)+1);
- tmp = temp;
-
- strcpy(temp, input);
-
-- arg = strtok(temp, "\n");
-+ arg = strtok_r(temp, "\n", &saveptr);
- for(i = 0; (i < index) && (arg!=NULL); i++)
-- arg = strtok(NULL, "\n");
-+ arg = strtok_r(NULL, "\n", &saveptr);
-
- if(arg != NULL)
- {
-@@ -164,6 +167,7 @@
- {
- char* temp_str = NULL;
- char* temp = NULL;
-+ char* arg = NULL;
- int i=0;
- int size = 0;
- if(src == NULL)
-@@ -172,21 +176,23 @@
- if((temp_str = (char*)malloc(strlen(src)+1))== NULL)
- return NULL;
-
-- temp = GetArg(src, i);
-- while(temp != NULL)
-+ arg = GetArg(src, i);
-+ while(arg != NULL)
- {
- i++;
-- temp = hebrew(temp);
-+ temp = hebrew(arg);
-+ free(arg);
- memcpy(temp_str + size , temp, strlen(temp));
- size += strlen(temp) ;
- temp_str[size++] = '\n';
-
- free(temp);
- temp = NULL;
-- temp = GetArg(src, i);
-+ arg = GetArg(src, i);
- }
-- free(temp);
-- temp_str[size]= '\0';
-+ // Above loop adds a line break after last line that wasn't there in src
-+ // replace it with the null terminator
-+ temp_str[--size]= '\0';
- return temp_str;
- }
-
diff --git a/net-im/licq/files/licq-1.3.8-memory_leak.patch b/net-im/licq/files/licq-1.3.8-memory_leak.patch
deleted file mode 100644
index 38ea9e0da5bb..000000000000
--- a/net-im/licq/files/licq-1.3.8-memory_leak.patch
+++ /dev/null
@@ -1,9 +0,0 @@
---- src/user.cpp
-+++ src/user.cpp
-@@ -3631,6 +3631,7 @@
- {
- gLog.Error("%sUnable to open picture file (%s):\n%s%s.\n", L_ERRORxSTR,
- szFilename, L_BLANKxSTR, strerror(errno));
-+ close(source);
- return;
- }
diff --git a/net-irc/hexchat/files/hexchat-2.9.5-autoconf-missing-macros.patch b/net-irc/hexchat/files/hexchat-2.9.5-autoconf-missing-macros.patch
deleted file mode 100644
index 3c169f820f1e..000000000000
--- a/net-irc/hexchat/files/hexchat-2.9.5-autoconf-missing-macros.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-From: Julian Ospald
-Date: Mon Jun 24 19:18:40 UTC 2013
-Subject: copy the gtk-2.0.m4 statically so we can run autoreconf
- even if gtk+ is not installed
-
-https://bugs.gentoo.org/show_bug.cgi?id=474582
-https://github.com/hexchat/hexchat/issues/658
-
---- /dev/null
-+++ hexchat-2.9.5/m4/gtk-2.0.m4
-@@ -0,0 +1,196 @@
-+# Configure paths for GTK+
-+# Owen Taylor 1997-2001
-+
-+dnl AM_PATH_GTK_2_0([MINIMUM-VERSION, [ACTION-IF-FOUND [, ACTION-IF-NOT-FOUND [, MODULES]]]])
-+dnl Test for GTK+, and define GTK_CFLAGS and GTK_LIBS, if gthread is specified in MODULES,
-+dnl pass to pkg-config
-+dnl
-+AC_DEFUN([AM_PATH_GTK_2_0],
-+[dnl
-+dnl Get the cflags and libraries from pkg-config
-+dnl
-+AC_ARG_ENABLE(gtktest, [ --disable-gtktest do not try to compile and run a test GTK+ program],
-+ , enable_gtktest=yes)
-+
-+ pkg_config_args=gtk+-2.0
-+ for module in . $4
-+ do
-+ case "$module" in
-+ gthread)
-+ pkg_config_args="$pkg_config_args gthread-2.0"
-+ ;;
-+ esac
-+ done
-+
-+ no_gtk=""
-+
-+ AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
-+
-+ if test x$PKG_CONFIG != xno ; then
-+ if pkg-config --atleast-pkgconfig-version 0.7 ; then
-+ :
-+ else
-+ echo "*** pkg-config too old; version 0.7 or better required."
-+ no_gtk=yes
-+ PKG_CONFIG=no
-+ fi
-+ else
-+ no_gtk=yes
-+ fi
-+
-+ min_gtk_version=ifelse([$1], ,2.0.0,$1)
-+ AC_MSG_CHECKING(for GTK+ - version >= $min_gtk_version)
-+
-+ if test x$PKG_CONFIG != xno ; then
-+ ## don't try to run the test against uninstalled libtool libs
-+ if $PKG_CONFIG --uninstalled $pkg_config_args; then
-+ echo "Will use uninstalled version of GTK+ found in PKG_CONFIG_PATH"
-+ enable_gtktest=no
-+ fi
-+
-+ if $PKG_CONFIG --atleast-version $min_gtk_version $pkg_config_args; then
-+ :
-+ else
-+ no_gtk=yes
-+ fi
-+ fi
-+
-+ if test x"$no_gtk" = x ; then
-+ GTK_CFLAGS=`$PKG_CONFIG $pkg_config_args --cflags`
-+ GTK_LIBS=`$PKG_CONFIG $pkg_config_args --libs`
-+ gtk_config_major_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\1/'`
-+ gtk_config_minor_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
-+ gtk_config_micro_version=`$PKG_CONFIG --modversion gtk+-2.0 | \
-+ sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
-+ if test "x$enable_gtktest" = "xyes" ; then
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GTK_CFLAGS"
-+ LIBS="$GTK_LIBS $LIBS"
-+dnl
-+dnl Now check if the installed GTK+ is sufficiently new. (Also sanity
-+dnl checks the results of pkg-config to some extent)
-+dnl
-+ rm -f conf.gtktest
-+ AC_TRY_RUN([
-+#include
-+#include
-+#include
-+
-+int
-+main ()
-+{
-+ int major, minor, micro;
-+ char *tmp_version;
-+
-+ fclose (fopen ("conf.gtktest", "w"));
-+
-+ /* HP/UX 9 (%@#!) writes to sscanf strings */
-+ tmp_version = g_strdup("$min_gtk_version");
-+ if (sscanf(tmp_version, "%d.%d.%d", &major, &minor, µ) != 3) {
-+ printf("%s, bad version string\n", "$min_gtk_version");
-+ exit(1);
-+ }
-+
-+ if ((gtk_major_version != $gtk_config_major_version) ||
-+ (gtk_minor_version != $gtk_config_minor_version) ||
-+ (gtk_micro_version != $gtk_config_micro_version))
-+ {
-+ printf("\n*** 'pkg-config --modversion gtk+-2.0' returned %d.%d.%d, but GTK+ (%d.%d.%d)\n",
-+ $gtk_config_major_version, $gtk_config_minor_version, $gtk_config_micro_version,
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ printf ("*** was found! If pkg-config was correct, then it is best\n");
-+ printf ("*** to remove the old version of GTK+. You may also be able to fix the error\n");
-+ printf("*** by modifying your LD_LIBRARY_PATH enviroment variable, or by editing\n");
-+ printf("*** /etc/ld.so.conf. Make sure you have run ldconfig if that is\n");
-+ printf("*** required on your system.\n");
-+ printf("*** If pkg-config was wrong, set the environment variable PKG_CONFIG_PATH\n");
-+ printf("*** to point to the correct configuration files\n");
-+ }
-+ else if ((gtk_major_version != GTK_MAJOR_VERSION) ||
-+ (gtk_minor_version != GTK_MINOR_VERSION) ||
-+ (gtk_micro_version != GTK_MICRO_VERSION))
-+ {
-+ printf("*** GTK+ header files (version %d.%d.%d) do not match\n",
-+ GTK_MAJOR_VERSION, GTK_MINOR_VERSION, GTK_MICRO_VERSION);
-+ printf("*** library (version %d.%d.%d)\n",
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ }
-+ else
-+ {
-+ if ((gtk_major_version > major) ||
-+ ((gtk_major_version == major) && (gtk_minor_version > minor)) ||
-+ ((gtk_major_version == major) && (gtk_minor_version == minor) && (gtk_micro_version >= micro)))
-+ {
-+ return 0;
-+ }
-+ else
-+ {
-+ printf("\n*** An old version of GTK+ (%d.%d.%d) was found.\n",
-+ gtk_major_version, gtk_minor_version, gtk_micro_version);
-+ printf("*** You need a version of GTK+ newer than %d.%d.%d. The latest version of\n",
-+ major, minor, micro);
-+ printf("*** GTK+ is always available from ftp://ftp.gtk.org.\n");
-+ printf("***\n");
-+ printf("*** If you have already installed a sufficiently new version, this error\n");
-+ printf("*** probably means that the wrong copy of the pkg-config shell script is\n");
-+ printf("*** being found. The easiest way to fix this is to remove the old version\n");
-+ printf("*** of GTK+, but you can also set the PKG_CONFIG environment to point to the\n");
-+ printf("*** correct copy of pkg-config. (In this case, you will have to\n");
-+ printf("*** modify your LD_LIBRARY_PATH enviroment variable, or edit /etc/ld.so.conf\n");
-+ printf("*** so that the correct libraries are found at run-time))\n");
-+ }
-+ }
-+ return 1;
-+}
-+],, no_gtk=yes,[echo $ac_n "cross compiling; assumed OK... $ac_c"])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ if test "x$no_gtk" = x ; then
-+ AC_MSG_RESULT(yes (version $gtk_config_major_version.$gtk_config_minor_version.$gtk_config_micro_version))
-+ ifelse([$2], , :, [$2])
-+ else
-+ AC_MSG_RESULT(no)
-+ if test "$PKG_CONFIG" = "no" ; then
-+ echo "*** A new enough version of pkg-config was not found."
-+ echo "*** See http://pkgconfig.sourceforge.net"
-+ else
-+ if test -f conf.gtktest ; then
-+ :
-+ else
-+ echo "*** Could not run GTK+ test program, checking why..."
-+ ac_save_CFLAGS="$CFLAGS"
-+ ac_save_LIBS="$LIBS"
-+ CFLAGS="$CFLAGS $GTK_CFLAGS"
-+ LIBS="$LIBS $GTK_LIBS"
-+ AC_TRY_LINK([
-+#include
-+#include
-+], [ return ((gtk_major_version) || (gtk_minor_version) || (gtk_micro_version)); ],
-+ [ echo "*** The test program compiled, but did not run. This usually means"
-+ echo "*** that the run-time linker is not finding GTK+ or finding the wrong"
-+ echo "*** version of GTK+. If it is not finding GTK+, you'll need to set your"
-+ echo "*** LD_LIBRARY_PATH environment variable, or edit /etc/ld.so.conf to point"
-+ echo "*** to the installed location Also, make sure you have run ldconfig if that"
-+ echo "*** is required on your system"
-+ echo "***"
-+ echo "*** If you have an old version installed, it is best to remove it, although"
-+ echo "*** you may also be able to get things to work by modifying LD_LIBRARY_PATH" ],
-+ [ echo "*** The test program failed to compile or link. See the file config.log for the"
-+ echo "*** exact error that occured. This usually means GTK+ is incorrectly installed."])
-+ CFLAGS="$ac_save_CFLAGS"
-+ LIBS="$ac_save_LIBS"
-+ fi
-+ fi
-+ GTK_CFLAGS=""
-+ GTK_LIBS=""
-+ ifelse([$3], , :, [$3])
-+ fi
-+ AC_SUBST(GTK_CFLAGS)
-+ AC_SUBST(GTK_LIBS)
-+ rm -f conf.gtktest
-+])
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index 93b717b9ca6d..7ea1340b2086 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -2,5 +2,5 @@ DIST chrony-2.2.1.tar.gz 340514 SHA256 4776fa8e80d698723e9a88eb882170951f6c45860
DIST chrony-2.3.tar.gz 355113 SHA256 58bffb523012fb0fa87cc0d94d6e36de9689fe9556519cbd0d1ba254af92ccb2 SHA512 2a9cda6c2bc931438b798bd037614196bdb1533d12432467a690d57095c74013c80c92fcaadbd43fd5b0c816872822527a1ade3014add458d669d7813d5fa080 WHIRLPOOL 06864181ac74b2cf13baf7d9098404f8540c26db41035fe38005fbfea8e12f2de179008f5b1a2544e24ebb7e4cca712421746690edb7f36b90416ad87901e920
DIST chrony-2.4.1.tar.gz 390641 SHA256 0fd59e0ef625b4459e3a9c7f221c52f56596582bce31abfae5f7369702edb6e0 SHA512 7772065103ad95706f80374d88ba452b76cf8e29689abf22b38e7eb5ad2fcc491593e11702400daa8bf908218614df21b08ff15ab2d3d2347876119cd80abc4d WHIRLPOOL ed2c2ac8e11371e009d3e96553bb73e58b410bb38e6123a9e39a3451e5dc6860d981d45e67b4e2dc47b39f616f95146feb35efd15dbaa90932f07837172c440a
DIST chrony-2.4.tar.gz 390077 SHA256 8d04e7cda2333289c2104b731d39c3c1db94816e43bae35d7ee4e7ae8af6391f SHA512 29bbeba05fb9897d438cddca7dd4e573a1e9da0d583bd737185088e8b777fdfba4056d091d2bbab78824de284b6244a8de7ada8f62be316e815a3d8ae6145485 WHIRLPOOL 7ad8b17ee8c29afa6734b7f096bb56bc08cfb200747141f0fa77e6a37daab118e1c571b8869abcab7e4893ae3eaae6a6d783425058bbaf8508cbd8de215cb49d
-DIST chrony-3.0-pre1.tar.gz 416442 SHA256 5e5852c4e47026b481eebc2218fe825c0c599aefe4c7aa1e3439e66d722c212c SHA512 c12328befd6360e051ca02f00e972fe30286417f177887bf922cfb276b80873d341fd6e4e044930444a42a75e69f0d6ac0c30c1dda9735919118287884455909 WHIRLPOOL bb983360bffcf1841210ccfbfbfeb375751d332f4bbbca9de4a2b203a1067fa5e88db68d2d4bace7766cb1fd5d687a5e92469d48d4124fd62a8e9501cdd9af94
DIST chrony-3.0-pre2.tar.gz 418066 SHA256 de91ec4deed5e7c40954c3ef6f59987f3384f30f224f1cb121a67b3874e5f830 SHA512 ffa729c7574c3ae5efea5eba70336e0c7cab8ff7fbef8588f016be91cfcf4413fec2515c874d672ebc6ed191fa15ae7c2f4ecef3a96e426b21f50cd782abbdeb WHIRLPOOL 1dca26084f967a0b0332156671ed2ca21219f775a4e497aec9801c89836e4bafc01efb0ad33667526ba9360ebd2d0222f1f293389f9de427bc1978f7c72301a4
+DIST chrony-3.0-pre3.tar.gz 419006 SHA256 81584f0afd7befbd7e5d0dbdfad6703738d5ee44a032200589e52689194dd717 SHA512 b471d6de2ce02e1c5a83a9989cbc80fba14dfeb9122b9810fd45ade40c597ba748fd278181292628bb922f1c6ebd52daf3df2aacf20ac63029728f2e4cf94c45 WHIRLPOOL e4dc45132b1f88f477460b2aa6d72e736b315ae839afb284dc2171a815c3ea4efd09a117682f935a1b1dd7808a2916f030cd25270e0b99bcfb8054923007e8ca
diff --git a/net-misc/chrony/chrony-2.4.1.ebuild b/net-misc/chrony/chrony-2.4.1.ebuild
index 66808fbedeef..25621193fbb7 100644
--- a/net-misc/chrony/chrony-2.4.1.ebuild
+++ b/net-misc/chrony/chrony-2.4.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 hppa ppc64"
+KEYWORDS="~alpha ~amd64 hppa ppc64"
IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
REQUIRED_USE="
?? ( libedit readline )
diff --git a/net-misc/chrony/chrony-3.0_pre1.ebuild b/net-misc/chrony/chrony-3.0_pre1.ebuild
deleted file mode 100644
index 11751446effb..000000000000
--- a/net-misc/chrony/chrony-3.0_pre1.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-inherit eutils systemd toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="http://chrony.tuxfamily.org/"
-SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-LICENSE="GPL-2"
-SLOT="0"
-
-KEYWORDS="~amd64 ~hppa ~ppc64"
-IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
-REQUIRED_USE="
- ?? ( libedit readline )
-"
-
-CDEPEND="
- caps? ( sys-libs/libcap )
- libedit? ( dev-libs/libedit )
- readline? ( >=sys-libs/readline-4.1-r4:= )
-"
-DEPEND="
- ${CDEPEND}
- html? ( dev-ruby/asciidoctor )
- pps? ( net-misc/pps-tools )
-"
-RDEPEND="
- ${CDEPEND}
- selinux? ( sec-policy/selinux-chronyd )
-"
-
-RESTRICT=test
-
-S="${WORKDIR}/${P/_/-}"
-
-src_prepare() {
- sed -i \
- -e 's:/etc/chrony\.:/etc/chrony/chrony.:g' \
- -e 's:/var/run:/run:g' \
- conf.c doc/*.man.in examples/* || die
-
- default
-}
-
-src_configure() {
- tc-export CC
-
- local CHRONY_EDITLINE
- # ./configure legend:
- # --disable-readline : disable line editing entirely
- # --without-readline : do not use sys-libs/readline (enabled by default)
- # --without-editline : do not use dev-libs/libedit (enabled by default)
- if ! use readline && ! use libedit; then
- CHRONY_EDITLINE='--disable-readline'
- else
- CHRONY_EDITLINE+=" $(usex readline '' --without-readline)"
- CHRONY_EDITLINE+=" $(usex libedit '' --without-editline)"
- fi
-
- # not an autotools generated script
- local CHRONY_CONFIGURE="
- ./configure \
- $(usex caps '' --disable-linuxcaps) \
- $(usex cmdmon '' --disable-cmdmon) \
- $(usex ipv6 '' --disable-ipv6) \
- $(usex ntp '' --disable-ntp) \
- $(usex phc '' --disable-phc) \
- $(usex pps '' --disable-pps) \
- $(usex rtc '' --disable-rtc) \
- $(usex refclock '' --disable-refclock) \
- $(usex adns '' --disable-asyncdns) \
- ${CHRONY_EDITLINE} \
- ${EXTRA_ECONF} \
- --docdir=/usr/share/doc/${PF} \
- --chronysockdir=/run/chrony \
- --mandir=/usr/share/man \
- --prefix=/usr \
- --sysconfdir=/etc/chrony \
- --disable-sechash \
- --without-nss \
- --without-tomcrypt
- "
-
- # print the ./configure call to aid in future debugging
- einfo ${CHRONY_CONFIGURE}
- bash ${CHRONY_CONFIGURE} || die
-}
-
-src_compile() {
- emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
- default
-
- newinitd "${FILESDIR}"/chronyd.init-r1 chronyd
- newconfd "${FILESDIR}"/chronyd.conf chronyd
-
- insinto /etc/${PN}
- newins examples/chrony.conf.example1 chrony.conf
-
- docinto examples
- dodoc examples/*.example*
-
- if use html; then
- docinto html
- dodoc doc/*.html
- fi
-
- keepdir /var/{lib,log}/chrony
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
- systemd_newunit "${FILESDIR}"/chronyd.service-r2 chronyd.service
- systemd_enable_ntpunit 50-chrony chronyd.service
-}
diff --git a/net-misc/chrony/chrony-3.0_pre2.ebuild b/net-misc/chrony/chrony-3.0_pre2.ebuild
index 11751446effb..d34419a76f72 100644
--- a/net-misc/chrony/chrony-3.0_pre2.ebuild
+++ b/net-misc/chrony/chrony-3.0_pre2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -11,7 +11,7 @@ SRC_URI="http://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~hppa ~ppc64"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc64"
IUSE="caps +cmdmon html ipv6 libedit +ntp +phc pps readline +refclock +rtc selinux +adns"
REQUIRED_USE="
?? ( libedit readline )
diff --git a/net-misc/chrony/chrony-2.4-r1.ebuild b/net-misc/chrony/chrony-3.0_pre3.ebuild
similarity index 98%
rename from net-misc/chrony/chrony-2.4-r1.ebuild
rename to net-misc/chrony/chrony-3.0_pre3.ebuild
index 29bed34f235a..d34419a76f72 100644
--- a/net-misc/chrony/chrony-2.4-r1.ebuild
+++ b/net-misc/chrony/chrony-3.0_pre3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
diff --git a/net-misc/openssh/Manifest b/net-misc/openssh/Manifest
index bf4a52a956a6..a1a9c19e28a1 100644
--- a/net-misc/openssh/Manifest
+++ b/net-misc/openssh/Manifest
@@ -1,6 +1,3 @@
-DIST openssh-7.2_p1-sctp.patch.xz 8088 SHA256 b9cc21336e23d44548e87964da9ff85ac83ce84693162abb172afb46be4a666e SHA512 b287684337a101a26ab8df6894b679b063cdaa7dfc7b78fcc0ce8350c27526f150a6463c515019beb0af2ff005cc109d2913998f95f828e553b835a4df8b64df WHIRLPOOL 16646a896f746946af84961974be08418b951c80249dce2fd4ae533a4d66e79d4372fd979aeda9c51aff51b86edf4178af18379e948195696a6fa114e2757306
-DIST openssh-7.2p2+x509-8.9.diff.gz 449308 SHA256 bd77fcd285d10a86fb2934e90776fe39e4cd2da043384ec2ca45296a60669589 SHA512 c7ed07aae72fd4f967ab5717831c51ad639ca59633c3768f6930bab0947f5429391e3911a7570288a1c688c8c21747f3cb722538ae96de6b50a021010e1506fa WHIRLPOOL 7c1328e471b0e5e9576117ec563b66fea142886b0666b6d51ac9b8ec09286ba7a965b62796c32206e855e484180797a2c31d500c27289f3bc8c7db2d3af95e6f
-DIST openssh-7.2p2.tar.gz 1499808 SHA256 a72781d1a043876a224ff1b0032daa4094d87565a68528759c1c2cab5482548c SHA512 44f62b3a7bc50a0735d496a5aedeefb71550d8c10ad8f22b94e29fcc8084842db96e8c4ca41fced17af69e1aab09ed1182a12ad8650d9a46fd8743a0344df95b WHIRLPOOL 95e16af6d1d82f4a660b56854b8e9da947b89e47775c06fe277a612cd1a7cabe7454087eb45034aedfb9b08096ce4aa427b9a37f43f70ccf1073664bdec13386
DIST openssh-7.3_p1-hpn-14.10-r1.patch.xz 20584 SHA256 0bbbfeb1f9f975ad591ed4ec74927172c5299ec1a76210197c14575204efa85d SHA512 f0a1c84af85f7cfc7cb58b5117b3d0f57fc25ae0dd608e38b48ef42da43780fd5cf243d26ff9b3fbd6f4cb1567852b87bcb75f98791cf3ad1892e8579a7834d3 WHIRLPOOL b1a8bae14c8189745056c15c9ed45207aa06af1f4c598a1af7dc3cc56e47bd0211a63989a920727e20311a148bbcf3202c202eae94cd1512c7d87816a9f44bcb
DIST openssh-7.3_p1-sctp.patch.xz 9968 SHA256 18c3db45ed1e5495db29626938d8432aee509e88057494f052cfc09d40824c7f SHA512 f249b76898af0c6f1f65f2a1cfb422648aa712818d0dc051b85a171f26bdddf7980fff5de7761161aa41c309e528b3801b4234f5cdd9f79f8eef173ae83f1e3c WHIRLPOOL 1d92b969154b77d8ce9e3a6d0302aa17ec95e2d5ea4de72c0fb5680a8ee12f518ee5b1c47f22ad5d1a923a74c43829ed36cf478fe75fe400de967ab48d93dc99
DIST openssh-7.3p1+x509-9.2.diff.gz 588078 SHA256 45f054cbb2b77ac8cc7ab01439e34083382137d47b840ca274555b7e2cf7098b SHA512 fab0da148b0833a651e8a7c36f344aacecef6fa92f8f1cb6302272d98c1ab018831f5850dcaa8f54a39f9ada9b7d5b0a0ea01defc3c6f603bbe211f6bff6a841 WHIRLPOOL 53f63d879f563909c57d23ced273e23eda1eace2a2ddfd54edf5f2ef15218cc7e5d927e54714b6850db541f361c459de50d79b0a4516b43ce4cba8eb66b49485
@@ -9,6 +6,5 @@ DIST openssh-7.3p1.tar.gz 1522617 SHA256 3ffb989a6dcaa69594c3b550d4855a5a2e1718c
DIST openssh-7.4_p1-sctp.patch.xz 8220 SHA256 18fa77f79ccae8b9a76bc877e9602113d91953bd487b6cc8284bfd1217438a23 SHA512 0c199e3b26949482125aeaa88216b2458292589e3eac8908d9134d13a1cae891094fcb0f752ed3009b3126cc72277b460205f39140c251792eb1b545271c3bd4 WHIRLPOOL 0f0ea1d36523b35d3be33d22fb84daa05fd14c464d69c19695235f81d26326bc53d6804bf34d0cc0c2584f412bfdac361d2b018032447d1033a4ff4fd9458a09
DIST openssh-7.4p1+x509-9.3.diff.gz 446572 SHA256 1d3fd23b3d02a3baad50890bf5498ef01af6dab6375da0aeb00a0d59fd3ac9ee SHA512 7ebc8d1f6ec36d652bbb6fb13d6d86f7db1abf8710af7b56c52fad9a18d73c9028a3307daabfdda26483a3bd9196120f6d18b6fb2c89b597b0a9ad0554161dfc WHIRLPOOL f878346a3154b7dbb01de41830d5857064af96d3a709aed40a112fe9aaadbe4801e5c3a22a1d2c8437b74a890596211be37e26d691ff611981d7375d262598c1
DIST openssh-7.4p1.tar.gz 1511780 SHA256 1b1fc4a14e2024293181924ed24872e6f2e06293f3e8926a376b8aec481f19d1 SHA512 4f3256f461f01366c5d5e0e45285eec65016e2643b3284b407f48f53d81087bf2c1caf7d5f7530d307a15c91c64de91446e1cba948e8fc68f82098290fe3b292 WHIRLPOOL 4ed9a277287d1f5c2fd371b53394d6dde36b25adf92d4b6b5b486a9d448648f2ecfbb721ae39ba8a129913c1148aa4db1e99f7960a7c69fa215dfa7b3b126029
-DIST openssh-lpk-7.2p2-0.3.14.patch.xz 17692 SHA256 2cd4108d60112bd97402f9c27aac2c24d334a37afe0933ad9c6377a257a68aee SHA512 e6a25f8f0106fadcb799300452d6f22034d3fc69bd1c95a3365884873861f41b1e9d49f2c5223dde6fcd00562c652ba466bc8c48833ce5ab353af3a041f75b15 WHIRLPOOL 237343b320772a1588b64c4135758af840199214129d7e8cfa9798f976c32902ca5493ee0c33b16003854fea243556997bc688640a9872b82c06f72c86f2586d
DIST openssh-lpk-7.3p1-0.3.14.patch.xz 17800 SHA256 cf1f60235cb8b0e561cd36cbf9e4f437e16fd748c2616d3f511c128c02deb76c SHA512 e9a73c5f13e41f6e11c744fdbcdb2e399c394479f79249e901cb3c101efb06f23d51d3ba4869db872184fa034a5910fc93a730fe906266c8d7409e39ad5b1ecd WHIRLPOOL bbdeadbed8f901148713bd9e4a082a4be2992c3151f995febd8be89bbb85d91185e1f0413b5a94a9340f2f404d18c9cee2aa6e032adaee0306aa1c624f6cc09c
DIST openssh-lpk-7.4p1-0.3.14.patch.xz 17076 SHA256 3a5e4104507d259ad15391136322ea5d067d7932199bbafde5cb478daf3595ad SHA512 1c91de291816ee0bb29ed3a2ffc42fb6fb4ba27a8616f8bd50accdf31d1fecc9b4fb3de6fb1ea6e722b69eb8cab68030ade87e126a4112667d14f3c2ef07d6cd WHIRLPOOL ea27224da952c6fe46b974a0e73d01e872a963e7e7cc7e9887a423357fb4ff82f4513ce48b6bbf7136afa8447bc6d93daa817cf5b2e24cb39dba15cbcff6d2cc
diff --git a/net-misc/openssh/files/openssh-7.1_p1-hpn-x509-glue.patch b/net-misc/openssh/files/openssh-7.1_p1-hpn-x509-glue.patch
deleted file mode 100644
index 393ea998cabf..000000000000
--- a/net-misc/openssh/files/openssh-7.1_p1-hpn-x509-glue.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- openssh-7.0p1-hpnssh14v5/0002-add-support-for-the-NONE-cipher.patch.orig 2015-08-24 11:17:05.379280954 -0700
-+++ openssh-7.0p1-hpnssh14v5/0002-add-support-for-the-NONE-cipher.patch 2015-08-24 11:19:30.788424050 -0700
-@@ -80,7 +80,7 @@
- + else
- + fatal("Pre-authentication none cipher requests are not allowed.");
- + }
-- debug("kex: %s %s %s %s",
-+ debug("kex: %s cipher: %s MAC: %s compression: %s",
- ctos ? "client->server" : "server->client",
- newkeys->enc.name,
- diff --git a/myproposal.h b/myproposal.h
diff --git a/net-misc/openssh/files/openssh-7.2_p1-GSSAPI-dns.patch b/net-misc/openssh/files/openssh-7.2_p1-GSSAPI-dns.patch
deleted file mode 100644
index 29e94e436318..000000000000
--- a/net-misc/openssh/files/openssh-7.2_p1-GSSAPI-dns.patch
+++ /dev/null
@@ -1,106 +0,0 @@
-http://bugs.gentoo.org/165444
-https://bugzilla.mindrot.org/show_bug.cgi?id=1008
-
---- openssh-7.2p1/readconf.c
-+++ openssh-7.2p1/readconf.c
-@@ -148,6 +148,7 @@
- oClearAllForwardings, oNoHostAuthenticationForLocalhost,
- oEnableSSHKeysign, oRekeyLimit, oVerifyHostKeyDNS, oConnectTimeout,
- oAddressFamily, oGssAuthentication, oGssDelegateCreds,
-+ oGssTrustDns,
- oServerAliveInterval, oServerAliveCountMax, oIdentitiesOnly,
- oSendEnv, oControlPath, oControlMaster, oControlPersist,
- oHashKnownHosts,
-@@ -194,9 +195,11 @@
- #if defined(GSSAPI)
- { "gssapiauthentication", oGssAuthentication },
- { "gssapidelegatecredentials", oGssDelegateCreds },
-+ { "gssapitrustdns", oGssTrustDns },
- #else
- { "gssapiauthentication", oUnsupported },
- { "gssapidelegatecredentials", oUnsupported },
-+ { "gssapitrustdns", oUnsupported },
- #endif
- { "fallbacktorsh", oDeprecated },
- { "usersh", oDeprecated },
-@@ -930,6 +933,10 @@
- intptr = &options->gss_deleg_creds;
- goto parse_flag;
-
-+ case oGssTrustDns:
-+ intptr = &options->gss_trust_dns;
-+ goto parse_flag;
-+
- case oBatchMode:
- intptr = &options->batch_mode;
- goto parse_flag;
-@@ -1649,6 +1656,7 @@
- options->challenge_response_authentication = -1;
- options->gss_authentication = -1;
- options->gss_deleg_creds = -1;
-+ options->gss_trust_dns = -1;
- options->password_authentication = -1;
- options->kbd_interactive_authentication = -1;
- options->kbd_interactive_devices = NULL;
-@@ -1779,6 +1787,8 @@
- options->gss_authentication = 0;
- if (options->gss_deleg_creds == -1)
- options->gss_deleg_creds = 0;
-+ if (options->gss_trust_dns == -1)
-+ options->gss_trust_dns = 0;
- if (options->password_authentication == -1)
- options->password_authentication = 1;
- if (options->kbd_interactive_authentication == -1)
---- openssh-7.2p1/readconf.h
-+++ openssh-7.2p1/readconf.h
-@@ -46,6 +46,7 @@
- /* Try S/Key or TIS, authentication. */
- int gss_authentication; /* Try GSS authentication */
- int gss_deleg_creds; /* Delegate GSS credentials */
-+ int gss_trust_dns; /* Trust DNS for GSS canonicalization */
- int password_authentication; /* Try password
- * authentication. */
- int kbd_interactive_authentication; /* Try keyboard-interactive auth. */
---- openssh-7.2p1/ssh_config.5
-+++ openssh-7.2p1/ssh_config.5
-@@ -830,6 +830,16 @@
- Forward (delegate) credentials to the server.
- The default is
- .Dq no .
-+Note that this option applies to protocol version 2 connections using GSSAPI.
-+.It Cm GSSAPITrustDns
-+Set to
-+.Dq yes to indicate that the DNS is trusted to securely canonicalize
-+the name of the host being connected to. If
-+.Dq no, the hostname entered on the
-+command line will be passed untouched to the GSSAPI library.
-+The default is
-+.Dq no .
-+This option only applies to protocol version 2 connections using GSSAPI.
- .It Cm HashKnownHosts
- Indicates that
- .Xr ssh 1
---- openssh-7.2p1/sshconnect2.c
-+++ openssh-7.2p1/sshconnect2.c
-@@ -656,6 +656,12 @@
- static u_int mech = 0;
- OM_uint32 min;
- int ok = 0;
-+ const char *gss_host;
-+
-+ if (options.gss_trust_dns)
-+ gss_host = get_canonical_hostname(1);
-+ else
-+ gss_host = authctxt->host;
-
- /* Try one GSSAPI method at a time, rather than sending them all at
- * once. */
-@@ -668,7 +674,7 @@
- /* My DER encoding requires length<128 */
- if (gss_supported->elements[mech].length < 128 &&
- ssh_gssapi_check_mechanism(&gssctxt,
-- &gss_supported->elements[mech], authctxt->host)) {
-+ &gss_supported->elements[mech], gss_host)) {
- ok = 1; /* Mechanism works */
- } else {
- mech++;
diff --git a/net-misc/openssh/files/openssh-7.2_p1-sctp-x509-glue.patch b/net-misc/openssh/files/openssh-7.2_p1-sctp-x509-glue.patch
deleted file mode 100644
index 2884ee92ce57..000000000000
--- a/net-misc/openssh/files/openssh-7.2_p1-sctp-x509-glue.patch
+++ /dev/null
@@ -1,74 +0,0 @@
---- openssh-7.2_p1-sctp.patch
-+++ openssh-7.2_p1-sctp.patch
-@@ -195,14 +195,6 @@
- .Op Fl c Ar cipher
- .Op Fl F Ar ssh_config
- .Op Fl i Ar identity_file
--@@ -181,6 +181,7 @@ For full details of the options listed below, and their possible values, see
-- .It ServerAliveCountMax
-- .It StrictHostKeyChecking
-- .It TCPKeepAlive
--+.It Transport
-- .It UpdateHostKeys
-- .It UsePrivilegedPort
-- .It User
- @@ -222,6 +223,8 @@ and
- to print debugging messages about their progress.
- This is helpful in
-@@ -477,19 +469,11 @@
- .Sh SYNOPSIS
- .Nm ssh
- .Bk -words
---.Op Fl 1246AaCfGgKkMNnqsTtVvXxYy
--+.Op Fl 1246AaCfGgKkMNnqsTtVvXxYyz
-+-.Op Fl 1246AaCdfgKkMNnqsTtVvXxYy
-++.Op Fl 1246AaCdfgKkMNnqsTtVvXxYyz
- .Op Fl b Ar bind_address
- .Op Fl c Ar cipher_spec
- .Op Fl D Oo Ar bind_address : Oc Ns Ar port
--@@ -536,6 +536,7 @@ For full details of the options listed below, and their possible values, see
-- .It StreamLocalBindUnlink
-- .It StrictHostKeyChecking
-- .It TCPKeepAlive
--+.It Transport
-- .It Tunnel
-- .It TunnelDevice
-- .It UpdateHostKeys
- @@ -770,6 +771,8 @@ controls.
- .Pp
- .It Fl y
-@@ -501,7 +485,7 @@
- index f9ff91f..d0d92ce 100644
- --- a/ssh.c
- +++ b/ssh.c
--@@ -195,12 +195,17 @@ extern int muxserver_sock;
-+@@ -195,11 +195,16 @@ extern int muxserver_sock;
- extern u_int muxclient_command;
-
- /* Prints a help message to the user. This function never returns. */
-@@ -515,18 +499,17 @@
- usage(void)
- {
- fprintf(stderr,
---"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
--+"usage: ssh [-1246AaCfGgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n"
-+-"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy] [-b bind_address] [-c cipher_spec]\n"
-++"usage: ssh [-1246AaCdfgKkMNnqsTtVvXxYy" SCTP_OPT "] [-b bind_address] [-c cipher_spec]\n"
- " [-D [bind_address:]port] [-E log_file] [-e escape_char]\n"
- " [-F configfile] [-I pkcs11] [-i identity_file] [-L address]\n"
-- " [-l login_name] [-m mac_spec] [-O ctl_cmd] [-o option] [-p port]\n"
- @@ -605,7 +610,7 @@ main(int ac, char **av)
-- argv0 = av[0];
-+ # define ENGCONFIG ""
-+ #endif
-
-- again:
--- while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx"
--+ while ((opt = getopt(ac, av, "1246ab:c:e:fgi:kl:m:no:p:qstvx" SCTP_OPT
-- "ACD:E:F:GI:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
-+- while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx"
-++ while ((opt = getopt(ac, av, "1246ab:c:de:fgi:kl:m:no:p:qstvx" SCTP_OPT
-+ "ACD:E:F:" ENGCONFIG "I:KL:MNO:PQ:R:S:TVw:W:XYy")) != -1) {
- switch (opt) {
- case '1':
- @@ -845,6 +850,11 @@ main(int ac, char **av)
diff --git a/net-misc/openssh/files/openssh-7.3_p1-hpn-x509-glue.patch b/net-misc/openssh/files/openssh-7.3_p1-hpn-x509-glue.patch
deleted file mode 100644
index d458e9efd7c0..000000000000
--- a/net-misc/openssh/files/openssh-7.3_p1-hpn-x509-glue.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/openssh-7.3_p1-hpn-14.10.patch 12:11:41.120750207 -0700
-+++ b/openssh-7.3_p1-hpn-14.10.patch 14:00:44.311487904 -0700
-@@ -141,7 +141,7 @@
- @@ -44,7 +44,7 @@ CC=@CC@
- LD=@LD@
- CFLAGS=@CFLAGS@
-- CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ $(PATHS) @DEFS@
-+ CPPFLAGS=-I. -I$(srcdir) @CPPFLAGS@ @LDAP_CPPFLAGS@ $(PATHS) @DEFS@
- -LIBS=@LIBS@
- +LIBS=@LIBS@ -lpthread
- K5LIBS=@K5LIBS@
-@@ -2098,7 +2098,7 @@
- @@ -527,10 +555,10 @@ send_client_banner(int connection_out, int minor1)
- /* Send our own protocol version identification. */
- if (compat20) {
-- xasprintf(&client_version_string, "SSH-%d.%d-%.100s\r\n",
-+ xasprintf(&client_version_string, "SSH-%d.%d-%.100s PKIX\r\n",
- - PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_VERSION);
- + PROTOCOL_MAJOR_2, PROTOCOL_MINOR_2, SSH_RELEASE);
- } else {
-@@ -2196,9 +2196,9 @@
- @@ -431,7 +431,7 @@ sshd_exchange_identification(int sock_in, int sock_out)
- }
-
-- xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s",
--- major, minor, SSH_VERSION,
--+ major, minor, SSH_RELEASE,
-+ xasprintf(&server_version_string, "SSH-%d.%d-%.100s%s%s%s%s",
-+- major, minor, SSH_VERSION, comment,
-++ major, minor, SSH_RELEASE, comment,
- *options.version_addendum == '\0' ? "" : " ",
- options.version_addendum, newline);
-
diff --git a/net-misc/openssh/openssh-7.2_p2-r1.ebuild b/net-misc/openssh/openssh-7.2_p2-r1.ebuild
deleted file mode 100644
index 282823eb3a85..000000000000
--- a/net-misc/openssh/openssh-7.2_p2-r1.ebuild
+++ /dev/null
@@ -1,334 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit eutils user flag-o-matic multilib autotools pam systemd versionator
-
-# Make it more portable between straight releases
-# and _p? releases.
-PARCH=${P/_}
-
-#HPN_PATCH="${PARCH}-hpnssh14v10.tar.xz"
-LDAP_PATCH="${PN}-lpk-7.2p2-0.3.14.patch.xz"
-X509_VER="8.9" X509_PATCH="${PN}-${PV/_}+x509-${X509_VER}.diff.gz"
-
-DESCRIPTION="Port of OpenBSD's free SSH release"
-HOMEPAGE="http://www.openssh.org/"
-SRC_URI="mirror://openbsd/OpenSSH/portable/${PARCH}.tar.gz
- mirror://gentoo/${PN}-7.2_p1-sctp.patch.xz
- ${HPN_PATCH:+hpn? (
- mirror://gentoo/${HPN_PATCH}
- mirror://sourceforge/hpnssh/${HPN_PATCH}
- )}
- ${LDAP_PATCH:+ldap? ( mirror://gentoo/${LDAP_PATCH} )}
- ${X509_PATCH:+X509? ( http://roumenpetrov.info/openssh/x509-${X509_VER}/${X509_PATCH} )}
- "
-
-LICENSE="BSD GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-# Probably want to drop ssl defaulting to on in a future version.
-IUSE="bindist debug ${HPN_PATCH:++}hpn kerberos kernel_linux ldap ldns libedit libressl livecd pam +pie sctp selinux skey ssh1 +ssl static X X509"
-REQUIRED_USE="ldns? ( ssl )
- pie? ( !static )
- ssh1? ( ssl )
- static? ( !kerberos !pam )
- X509? ( !ldap ssl )"
-
-LIB_DEPEND="
- ldns? (
- net-libs/ldns[static-libs(+)]
- !bindist? ( net-libs/ldns[ecdsa,ssl] )
- bindist? ( net-libs/ldns[-ecdsa,ssl] )
- )
- libedit? ( dev-libs/libedit[static-libs(+)] )
- sctp? ( net-misc/lksctp-tools[static-libs(+)] )
- selinux? ( >=sys-libs/libselinux-1.28[static-libs(+)] )
- skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
- ssl? (
- !libressl? (
- >=dev-libs/openssl-0.9.8f:0[bindist=]
- dev-libs/openssl:0[static-libs(+)]
- )
- libressl? ( dev-libs/libressl[static-libs(+)] )
- )
- >=sys-libs/zlib-1.2.3[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- virtual/pkgconfig
- virtual/os-headers
- sys-devel/autoconf"
-RDEPEND="${RDEPEND}
- pam? ( >=sys-auth/pambase-20081028 )
- userland_GNU? ( virtual/shadow )
- X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
- # this sucks, but i'd rather have people unable to `emerge -u openssh`
- # than not be able to log in to their server any more
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
- local fail="
- $(use X509 && maybe_fail X509 X509_PATCH)
- $(use ldap && maybe_fail ldap LDAP_PATCH)
- $(use hpn && maybe_fail hpn HPN_PATCH)
- "
- fail=$(echo ${fail})
- if [[ -n ${fail} ]] ; then
- eerror "Sorry, but this version does not yet support features"
- eerror "that you requested: ${fail}"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "booooo"
- fi
-
- # Make sure people who are using tcp wrappers are notified of its removal. #531156
- if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
- ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
- ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please."
- fi
-}
-
-save_version() {
- # version.h patch conflict avoidence
- mv version.h version.h.$1
- cp -f version.h.pristine version.h
-}
-
-src_prepare() {
- sed -i \
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
- pathnames.h || die
- # keep this as we need it to avoid the conflict between LPK and HPN changing
- # this file.
- cp version.h version.h.pristine
-
- # don't break .ssh/authorized_keys2 for fun
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
- if use X509 ; then
- pushd .. >/dev/null
- if use hpn ; then
- pushd ${HPN_PATCH%.*.*} >/dev/null
- epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
- popd >/dev/null
- fi
- epatch "${FILESDIR}"/${PN}-7.2_p1-sctp-x509-glue.patch
- popd >/dev/null
- epatch "${WORKDIR}"/${X509_PATCH%.*}
- #epatch "${FILESDIR}"/${PN}-7.1_p2-x509-hpn14v10-glue.patch
- #save_version X509
- fi
- if use ldap ; then
- epatch "${WORKDIR}"/${LDAP_PATCH%.*}
- save_version LPK
- fi
- epatch "${FILESDIR}"/${PN}-7.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex
- epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
- epatch "${WORKDIR}"/${PN}-7.2_p1-sctp.patch
- if use hpn ; then
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- EPATCH_MULTI_MSG="Applying HPN patchset ..." \
- epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
- save_version HPN
- fi
-
- tc-export PKG_CONFIG
- local sed_args=(
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
- # Disable PATH reset, trust what portage gives us #254615
- -e 's:^PATH=/:#PATH=/:'
- # Disable fortify flags ... our gcc does this for us
- -e 's:-D_FORTIFY_SOURCE=2::'
- )
- # The -ftrapv flag ICEs on hppa #505182
- use hppa && sed_args+=(
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
- )
- sed -i "${sed_args[@]}" configure{.ac,} || die
-
- epatch_user #473004
-
- # Now we can build a sane merged version.h
- (
- sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
- macros=()
- for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
- printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
- ) > version.h
-
- eautoreconf
-}
-
-src_configure() {
- addwrite /dev/ptmx
-
- use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
- use static && append-ldflags -static
-
- local myconf=(
- --with-ldflags="${LDFLAGS}"
- --disable-strip
- --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
- --sysconfdir="${EPREFIX}"/etc/ssh
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
- --datadir="${EPREFIX}"/usr/share/openssh
- --with-privsep-path="${EPREFIX}"/var/empty
- --with-privsep-user=sshd
- $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
- # We apply the ldap patch conditionally, so can't pass --without-ldap
- # unconditionally else we get unknown flag warnings.
- $(use ldap && use_with ldap)
- $(use_with ldns)
- $(use_with libedit)
- $(use_with pam)
- $(use_with pie)
- $(use_with sctp)
- $(use_with selinux)
- $(use_with skey)
- $(use_with ssh1)
- $(use_with ssl openssl)
- $(use_with ssl md5-passwords)
- $(use_with ssl ssl-engine)
- )
-
- # The seccomp sandbox is broken on x32, so use the older method for now. #553748
- use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd.rc6.4 sshd
- newconfd "${FILESDIR}"/sshd.confd sshd
- keepdir /var/empty
-
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- # Gentoo tweaks to default config files
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
- # Allow client to pass locale environment variables #367017
- AcceptEnv LANG LC_*
- EOF
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
- # Send locale environment variables #367017
- SendEnv LANG LC_*
- EOF
-
- # Allow root password logins for live-cds
- if use livecd ; then
- sed -i \
- -e "/PermitRootLogin/c\\
-\\
-# By popular demand, we're allowing root login with password on livecds\\
-PermitRootLogin Yes\\
-" "${ED}"/etc/ssh/sshd_config
- fi
-
- if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
- insinto /etc/openldap/schema/
- newins openssh-lpk_openldap.schema openssh-lpk.schema
- fi
-
- doman contrib/ssh-copy-id.1
- dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
- diropts -m 0700
- dodir /etc/skel/.ssh
-
- systemd_dounit "${FILESDIR}"/sshd.{service,socket}
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
- local t tests skipped failed passed shell
- tests="interop-tests compat-tests"
- skipped=""
- shell=$(egetshell ${UID})
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
- elog "Running the full OpenSSH testsuite"
- elog "requires a usable shell for the 'portage'"
- elog "user, so we will run a subset only."
- skipped="${skipped} tests"
- else
- tests="${tests} tests"
- fi
- # It will also attempt to write to the homedir .ssh
- local sshhome=${T}/homedir
- mkdir -p "${sshhome}"/.ssh
- for t in ${tests} ; do
- # Some tests read from stdin ...
- HOMEDIR="${sshhome}" \
- emake -k -j1 ${t} =sys-libs/libselinux-1.28[static-libs(+)] )
- skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
- ssl? (
- !libressl? (
- >=dev-libs/openssl-0.9.8f:0[bindist=]
- dev-libs/openssl:0[static-libs(+)]
- )
- libressl? ( dev-libs/libressl[static-libs(+)] )
- )
- >=sys-libs/zlib-1.2.3[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- virtual/pkgconfig
- virtual/os-headers
- sys-devel/autoconf"
-RDEPEND="${RDEPEND}
- pam? ( >=sys-auth/pambase-20081028 )
- userland_GNU? ( virtual/shadow )
- X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
- # this sucks, but i'd rather have people unable to `emerge -u openssh`
- # than not be able to log in to their server any more
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
- local fail="
- $(use X509 && maybe_fail X509 X509_PATCH)
- $(use ldap && maybe_fail ldap LDAP_PATCH)
- $(use hpn && maybe_fail hpn HPN_PATCH)
- "
- fail=$(echo ${fail})
- if [[ -n ${fail} ]] ; then
- eerror "Sorry, but this version does not yet support features"
- eerror "that you requested: ${fail}"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "booooo"
- fi
-
- # Make sure people who are using tcp wrappers are notified of its removal. #531156
- if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
- ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
- ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please."
- fi
-}
-
-save_version() {
- # version.h patch conflict avoidence
- mv version.h version.h.$1
- cp -f version.h.pristine version.h
-}
-
-src_prepare() {
- sed -i \
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
- pathnames.h || die
- # keep this as we need it to avoid the conflict between LPK and HPN changing
- # this file.
- cp version.h version.h.pristine
-
- # don't break .ssh/authorized_keys2 for fun
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
- if use X509 ; then
- pushd .. >/dev/null
- if use hpn ; then
- pushd ${HPN_PATCH%.*.*} >/dev/null
- epatch "${FILESDIR}"/${PN}-7.1_p1-hpn-x509-glue.patch
- popd >/dev/null
- fi
- epatch "${FILESDIR}"/${PN}-7.2_p1-sctp-x509-glue.patch
- popd >/dev/null
- epatch "${WORKDIR}"/${X509_PATCH%.*}
- #epatch "${FILESDIR}"/${PN}-7.1_p2-x509-hpn14v10-glue.patch
- #save_version X509
- fi
- if use ldap ; then
- epatch "${WORKDIR}"/${LDAP_PATCH%.*}
- save_version LPK
- fi
- epatch "${FILESDIR}"/${PN}-7.2_p1-GSSAPI-dns.patch #165444 integrated into gsskex
- epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
- epatch "${WORKDIR}"/${PN}-7.2_p1-sctp.patch
- if use hpn ; then
- EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- EPATCH_MULTI_MSG="Applying HPN patchset ..." \
- epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
- save_version HPN
- fi
-
- tc-export PKG_CONFIG
- local sed_args=(
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
- # Disable PATH reset, trust what portage gives us #254615
- -e 's:^PATH=/:#PATH=/:'
- # Disable fortify flags ... our gcc does this for us
- -e 's:-D_FORTIFY_SOURCE=2::'
- )
- # The -ftrapv flag ICEs on hppa #505182
- use hppa && sed_args+=(
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
- )
- sed -i "${sed_args[@]}" configure{.ac,} || die
-
- epatch_user #473004
-
- # Now we can build a sane merged version.h
- (
- sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
- macros=()
- for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
- printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
- ) > version.h
-
- eautoreconf
-}
-
-src_configure() {
- addwrite /dev/ptmx
-
- use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
- use static && append-ldflags -static
-
- local myconf=(
- --with-ldflags="${LDFLAGS}"
- --disable-strip
- --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
- --sysconfdir="${EPREFIX}"/etc/ssh
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
- --datadir="${EPREFIX}"/usr/share/openssh
- --with-privsep-path="${EPREFIX}"/var/empty
- --with-privsep-user=sshd
- $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
- # We apply the ldap patch conditionally, so can't pass --without-ldap
- # unconditionally else we get unknown flag warnings.
- $(use ldap && use_with ldap)
- $(use_with ldns)
- $(use_with libedit)
- $(use_with pam)
- $(use_with pie)
- $(use_with sctp)
- $(use_with selinux)
- $(use_with skey)
- $(use_with ssh1)
- $(use_with ssl openssl)
- $(use_with ssl md5-passwords)
- $(use_with ssl ssl-engine)
- )
-
- # The seccomp sandbox is broken on x32, so use the older method for now. #553748
- use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd.rc6.4 sshd
- newconfd "${FILESDIR}"/sshd.confd sshd
- keepdir /var/empty
-
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- # Gentoo tweaks to default config files
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
- # Allow client to pass locale environment variables #367017
- AcceptEnv LANG LC_*
- EOF
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
- # Send locale environment variables #367017
- SendEnv LANG LC_*
- EOF
-
- if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
- insinto /etc/openldap/schema/
- newins openssh-lpk_openldap.schema openssh-lpk.schema
- fi
-
- doman contrib/ssh-copy-id.1
- dodoc ChangeLog CREDITS OVERVIEW README* TODO sshd_config
-
- diropts -m 0700
- dodir /etc/skel/.ssh
-
- systemd_dounit "${FILESDIR}"/sshd.{service,socket}
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
- local t tests skipped failed passed shell
- tests="interop-tests compat-tests"
- skipped=""
- shell=$(egetshell ${UID})
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
- elog "Running the full OpenSSH testsuite"
- elog "requires a usable shell for the 'portage'"
- elog "user, so we will run a subset only."
- skipped="${skipped} tests"
- else
- tests="${tests} tests"
- fi
- # It will also attempt to write to the homedir .ssh
- local sshhome=${T}/homedir
- mkdir -p "${sshhome}"/.ssh
- for t in ${tests} ; do
- # Some tests read from stdin ...
- HOMEDIR="${sshhome}" \
- emake -k -j1 ${t} =sys-libs/libselinux-1.28[static-libs(+)] )
- skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
- ssl? (
- !libressl? (
- >=dev-libs/openssl-0.9.8f:0[bindist=]
- dev-libs/openssl:0[static-libs(+)]
- )
- libressl? ( dev-libs/libressl[static-libs(+)] )
- )
- >=sys-libs/zlib-1.2.3[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- virtual/pkgconfig
- virtual/os-headers
- sys-devel/autoconf"
-RDEPEND="${RDEPEND}
- pam? ( >=sys-auth/pambase-20081028 )
- userland_GNU? ( virtual/shadow )
- X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
- # this sucks, but i'd rather have people unable to `emerge -u openssh`
- # than not be able to log in to their server any more
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
- local fail="
- $(use X509 && maybe_fail X509 X509_PATCH)
- $(use ldap && maybe_fail ldap LDAP_PATCH)
- $(use hpn && maybe_fail hpn HPN_PATCH)
- "
- fail=$(echo ${fail})
- if [[ -n ${fail} ]] ; then
- eerror "Sorry, but this version does not yet support features"
- eerror "that you requested: ${fail}"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "booooo"
- fi
-
- # Make sure people who are using tcp wrappers are notified of its removal. #531156
- if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
- ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
- ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please."
- fi
-}
-
-save_version() {
- # version.h patch conflict avoidence
- mv version.h version.h.$1
- cp -f version.h.pristine version.h
-}
-
-src_prepare() {
- sed -i \
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
- pathnames.h || die
- # keep this as we need it to avoid the conflict between LPK and HPN changing
- # this file.
- cp version.h version.h.pristine
-
- # don't break .ssh/authorized_keys2 for fun
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
- if use X509 ; then
- pushd .. >/dev/null
- if use hpn ; then
- pushd "${WORKDIR}" >/dev/null
- epatch "${FILESDIR}"/${P}-hpn-x509-9.2-glue.patch
- popd >/dev/null
- fi
- epatch "${FILESDIR}"/${PN}-7.3_p1-sctp-x509-glue.patch
- sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die
- popd >/dev/null
- epatch "${WORKDIR}"/${X509_PATCH%.*}
- epatch "${FILESDIR}"/${P}-x509-9.2-warnings.patch
- save_version X509
- else
- # bug #592122, fixed by X509 patch
- epatch "${FILESDIR}"/${P}-fix-ssh1-with-no-ssh1-host-key.patch
- fi
- if use ldap ; then
- epatch "${WORKDIR}"/${LDAP_PATCH%.*}
- save_version LPK
- fi
-
- epatch "${FILESDIR}"/${PN}-7.3_p1-GSSAPI-dns.patch #165444 integrated into gsskex
- epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
- epatch "${WORKDIR}"/${SCTP_PATCH%.*}
-
- if use hpn ; then
- #EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- # EPATCH_MULTI_MSG="Applying HPN patchset ..." \
- # epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
- epatch "${WORKDIR}"/${HPN_PATCH}
- epatch "${FILESDIR}"/${P}-hpn-cipher-ctr-mt-no-deadlocks.patch
- save_version HPN
- fi
-
- tc-export PKG_CONFIG
- local sed_args=(
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
- # Disable PATH reset, trust what portage gives us #254615
- -e 's:^PATH=/:#PATH=/:'
- # Disable fortify flags ... our gcc does this for us
- -e 's:-D_FORTIFY_SOURCE=2::'
- )
- # The -ftrapv flag ICEs on hppa #505182
- use hppa && sed_args+=(
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
- )
- sed -i "${sed_args[@]}" configure{.ac,} || die
-
- # 7.3 added seccomp support to MIPS, but failed to handled the N32
- # case. This patch is temporary until upstream fixes. See
- # Gentoo bug #591392 or upstream #2590.
- [[ ${CHOST} == mips64*-linux-* && ${ABI} == "n32" ]] \
- && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
- epatch_user #473004
-
- # Now we can build a sane merged version.h
- (
- sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
- macros=()
- for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
- printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
- ) > version.h
-
- eautoreconf
-}
-
-src_configure() {
- addwrite /dev/ptmx
-
- use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
- use static && append-ldflags -static
-
- local myconf=(
- --with-ldflags="${LDFLAGS}"
- --disable-strip
- --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
- --sysconfdir="${EPREFIX}"/etc/ssh
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
- --datadir="${EPREFIX}"/usr/share/openssh
- --with-privsep-path="${EPREFIX}"/var/empty
- --with-privsep-user=sshd
- $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
- # We apply the ldap patch conditionally, so can't pass --without-ldap
- # unconditionally else we get unknown flag warnings.
- $(use ldap && use_with ldap)
- $(use_with ldns)
- $(use_with libedit)
- $(use_with pam)
- $(use_with pie)
- $(use_with sctp)
- $(use_with selinux)
- $(use_with skey)
- $(use_with ssh1)
- $(use_with ssl openssl)
- $(use_with ssl md5-passwords)
- $(use_with ssl ssl-engine)
- )
-
- # The seccomp sandbox is broken on x32, so use the older method for now. #553748
- use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd.rc6.4 sshd
- newconfd "${FILESDIR}"/sshd.confd sshd
- keepdir /var/empty
-
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- # Gentoo tweaks to default config files
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
- # Allow client to pass locale environment variables #367017
- AcceptEnv LANG LC_*
- EOF
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
- # Send locale environment variables #367017
- SendEnv LANG LC_*
- EOF
-
- if use livecd ; then
- sed -i \
- -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
- insinto /etc/openldap/schema/
- newins openssh-lpk_openldap.schema openssh-lpk.schema
- fi
-
- doman contrib/ssh-copy-id.1
- dodoc CREDITS OVERVIEW README* TODO sshd_config
- use X509 || dodoc ChangeLog
-
- diropts -m 0700
- dodir /etc/skel/.ssh
-
- systemd_dounit "${FILESDIR}"/sshd.{service,socket}
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
- local t tests skipped failed passed shell
- tests="interop-tests compat-tests"
- skipped=""
- shell=$(egetshell ${UID})
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
- elog "Running the full OpenSSH testsuite"
- elog "requires a usable shell for the 'portage'"
- elog "user, so we will run a subset only."
- skipped="${skipped} tests"
- else
- tests="${tests} tests"
- fi
- # It will also attempt to write to the homedir .ssh
- local sshhome=${T}/homedir
- mkdir -p "${sshhome}"/.ssh
- for t in ${tests} ; do
- # Some tests read from stdin ...
- HOMEDIR="${sshhome}" HOME="${sshhome}" \
- emake -k -j1 ${t} =sys-libs/libselinux-1.28[static-libs(+)] )
- skey? ( >=sys-auth/skey-1.1.5-r1[static-libs(+)] )
- ssl? (
- !libressl? (
- >=dev-libs/openssl-0.9.8f:0[bindist=]
- dev-libs/openssl:0[static-libs(+)]
- )
- libressl? ( dev-libs/libressl[static-libs(+)] )
- )
- >=sys-libs/zlib-1.2.3[static-libs(+)]"
-RDEPEND="
- !static? ( ${LIB_DEPEND//\[static-libs(+)]} )
- pam? ( virtual/pam )
- kerberos? ( virtual/krb5 )
- ldap? ( net-nds/openldap )"
-DEPEND="${RDEPEND}
- static? ( ${LIB_DEPEND} )
- virtual/pkgconfig
- virtual/os-headers
- sys-devel/autoconf"
-RDEPEND="${RDEPEND}
- pam? ( >=sys-auth/pambase-20081028 )
- userland_GNU? ( virtual/shadow )
- X? ( x11-apps/xauth )"
-
-S=${WORKDIR}/${PARCH}
-
-pkg_setup() {
- # this sucks, but i'd rather have people unable to `emerge -u openssh`
- # than not be able to log in to their server any more
- maybe_fail() { [[ -z ${!2} ]] && echo "$1" ; }
- local fail="
- $(use X509 && maybe_fail X509 X509_PATCH)
- $(use ldap && maybe_fail ldap LDAP_PATCH)
- $(use hpn && maybe_fail hpn HPN_PATCH)
- "
- fail=$(echo ${fail})
- if [[ -n ${fail} ]] ; then
- eerror "Sorry, but this version does not yet support features"
- eerror "that you requested: ${fail}"
- eerror "Please mask ${PF} for now and check back later:"
- eerror " # echo '=${CATEGORY}/${PF}' >> /etc/portage/package.mask"
- die "booooo"
- fi
-
- # Make sure people who are using tcp wrappers are notified of its removal. #531156
- if grep -qs '^ *sshd *:' "${EROOT}"/etc/hosts.{allow,deny} ; then
- ewarn "Sorry, but openssh no longer supports tcp-wrappers, and it seems like"
- ewarn "you're trying to use it. Update your ${EROOT}etc/hosts.{allow,deny} please."
- fi
-}
-
-save_version() {
- # version.h patch conflict avoidence
- mv version.h version.h.$1
- cp -f version.h.pristine version.h
-}
-
-src_prepare() {
- sed -i \
- -e "/_PATH_XAUTH/s:/usr/X11R6/bin/xauth:${EPREFIX}/usr/bin/xauth:" \
- pathnames.h || die
- # keep this as we need it to avoid the conflict between LPK and HPN changing
- # this file.
- cp version.h version.h.pristine
-
- # don't break .ssh/authorized_keys2 for fun
- sed -i '/^AuthorizedKeysFile/s:^:#:' sshd_config || die
-
- if use X509 ; then
- pushd .. >/dev/null
- if use hpn ; then
- pushd "${WORKDIR}" >/dev/null
- epatch "${FILESDIR}"/${P}-hpn-x509-9.2-glue.patch
- popd >/dev/null
- fi
- epatch "${FILESDIR}"/${PN}-7.3_p1-sctp-x509-glue.patch
- sed -i 's:PKIX_VERSION:SSH_X509:g' "${WORKDIR}"/${X509_PATCH%.*} || die
- popd >/dev/null
- epatch "${WORKDIR}"/${X509_PATCH%.*}
- epatch "${FILESDIR}"/${P}-x509-9.2-warnings.patch
- save_version X509
- else
- # bug #592122, fixed by X509 patch
- epatch "${FILESDIR}"/${P}-fix-ssh1-with-no-ssh1-host-key.patch
- fi
- if use ldap ; then
- epatch "${WORKDIR}"/${LDAP_PATCH%.*}
- save_version LPK
- fi
-
- epatch "${FILESDIR}"/${PN}-7.3_p1-GSSAPI-dns.patch #165444 integrated into gsskex
- epatch "${FILESDIR}"/${PN}-6.7_p1-openssl-ignore-status.patch
- epatch "${WORKDIR}"/${SCTP_PATCH%.*}
-
- if use hpn ; then
- #EPATCH_FORCE="yes" EPATCH_SUFFIX="patch" \
- # EPATCH_MULTI_MSG="Applying HPN patchset ..." \
- # epatch "${WORKDIR}"/${HPN_PATCH%.*.*}
- epatch "${WORKDIR}"/${HPN_PATCH}
- epatch "${FILESDIR}"/${P}-hpn-cipher-ctr-mt-no-deadlocks.patch
- save_version HPN
- fi
-
- tc-export PKG_CONFIG
- local sed_args=(
- -e "s:-lcrypto:$(${PKG_CONFIG} --libs openssl):"
- # Disable PATH reset, trust what portage gives us #254615
- -e 's:^PATH=/:#PATH=/:'
- # Disable fortify flags ... our gcc does this for us
- -e 's:-D_FORTIFY_SOURCE=2::'
- )
- # The -ftrapv flag ICEs on hppa #505182
- use hppa && sed_args+=(
- -e '/CFLAGS/s:-ftrapv:-fdisable-this-test:'
- -e '/OSSH_CHECK_CFLAG_LINK.*-ftrapv/d'
- )
- sed -i "${sed_args[@]}" configure{.ac,} || die
-
- # 7.3 added seccomp support to MIPS, but failed to handled the N32
- # case. This patch is temporary until upstream fixes. See
- # Gentoo bug #591392 or upstream #2590.
- [[ ${CHOST} == mips64*-linux-* && ${ABI} == "n32" ]] \
- && epatch "${FILESDIR}"/${PN}-7.3-mips-seccomp-n32.patch
-
- epatch "${FILESDIR}"/${P}-NEWKEYS_null_deref.patch # 595342
-
- epatch_user #473004
-
- # Now we can build a sane merged version.h
- (
- sed '/^#define SSH_RELEASE/d' version.h.* | sort -u
- macros=()
- for p in HPN LPK X509 ; do [ -e version.h.${p} ] && macros+=( SSH_${p} ) ; done
- printf '#define SSH_RELEASE SSH_VERSION SSH_PORTABLE %s\n' "${macros}"
- ) > version.h
-
- eautoreconf
-}
-
-src_configure() {
- addwrite /dev/ptmx
-
- use debug && append-cppflags -DSANDBOX_SECCOMP_FILTER_DEBUG
- use static && append-ldflags -static
-
- local myconf=(
- --with-ldflags="${LDFLAGS}"
- --disable-strip
- --with-pid-dir="${EPREFIX}"$(usex kernel_linux '' '/var')/run
- --sysconfdir="${EPREFIX}"/etc/ssh
- --libexecdir="${EPREFIX}"/usr/$(get_libdir)/misc
- --datadir="${EPREFIX}"/usr/share/openssh
- --with-privsep-path="${EPREFIX}"/var/empty
- --with-privsep-user=sshd
- $(use_with kerberos kerberos5 "${EPREFIX}"/usr)
- # We apply the ldap patch conditionally, so can't pass --without-ldap
- # unconditionally else we get unknown flag warnings.
- $(use ldap && use_with ldap)
- $(use_with ldns)
- $(use_with libedit)
- $(use_with pam)
- $(use_with pie)
- $(use_with sctp)
- $(use_with selinux)
- $(use_with skey)
- $(use_with ssh1)
- $(use_with ssl openssl)
- $(use_with ssl md5-passwords)
- $(use_with ssl ssl-engine)
- )
-
- # The seccomp sandbox is broken on x32, so use the older method for now. #553748
- use amd64 && [[ ${ABI} == "x32" ]] && myconf+=( --with-sandbox=rlimit )
-
- econf "${myconf[@]}"
-}
-
-src_install() {
- emake install-nokeys DESTDIR="${D}"
- fperms 600 /etc/ssh/sshd_config
- dobin contrib/ssh-copy-id
- newinitd "${FILESDIR}"/sshd.rc6.4 sshd
- newconfd "${FILESDIR}"/sshd.confd sshd
- keepdir /var/empty
-
- newpamd "${FILESDIR}"/sshd.pam_include.2 sshd
- if use pam ; then
- sed -i \
- -e "/^#UsePAM /s:.*:UsePAM yes:" \
- -e "/^#PasswordAuthentication /s:.*:PasswordAuthentication no:" \
- -e "/^#PrintMotd /s:.*:PrintMotd no:" \
- -e "/^#PrintLastLog /s:.*:PrintLastLog no:" \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- # Gentoo tweaks to default config files
- cat <<-EOF >> "${ED}"/etc/ssh/sshd_config
-
- # Allow client to pass locale environment variables #367017
- AcceptEnv LANG LC_*
- EOF
- cat <<-EOF >> "${ED}"/etc/ssh/ssh_config
-
- # Send locale environment variables #367017
- SendEnv LANG LC_*
- EOF
-
- if use livecd ; then
- sed -i \
- -e '/^#PermitRootLogin/c# Allow root login with password on livecds.\nPermitRootLogin Yes' \
- "${ED}"/etc/ssh/sshd_config || die
- fi
-
- if ! use X509 && [[ -n ${LDAP_PATCH} ]] && use ldap ; then
- insinto /etc/openldap/schema/
- newins openssh-lpk_openldap.schema openssh-lpk.schema
- fi
-
- doman contrib/ssh-copy-id.1
- dodoc CREDITS OVERVIEW README* TODO sshd_config
- use X509 || dodoc ChangeLog
-
- diropts -m 0700
- dodir /etc/skel/.ssh
-
- systemd_dounit "${FILESDIR}"/sshd.{service,socket}
- systemd_newunit "${FILESDIR}"/sshd_at.service 'sshd@.service'
-}
-
-src_test() {
- local t tests skipped failed passed shell
- tests="interop-tests compat-tests"
- skipped=""
- shell=$(egetshell ${UID})
- if [[ ${shell} == */nologin ]] || [[ ${shell} == */false ]] ; then
- elog "Running the full OpenSSH testsuite"
- elog "requires a usable shell for the 'portage'"
- elog "user, so we will run a subset only."
- skipped="${skipped} tests"
- else
- tests="${tests} tests"
- fi
- # It will also attempt to write to the homedir .ssh
- local sshhome=${T}/homedir
- mkdir -p "${sshhome}"/.ssh
- for t in ${tests} ; do
- # Some tests read from stdin ...
- HOMEDIR="${sshhome}" HOME="${sshhome}" \
- emake -k -j1 ${t}
- #include
- #include
-+#include
- #include
- #include
- #include
diff --git a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch b/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
deleted file mode 100644
index d5fdf70f4735..000000000000
--- a/sci-geosciences/merkaartor/files/0.17.2-libproxy.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h
---- merkaartor-0.17.2.old//src/Preferences/MerkaartorPreferences.h 2011-06-10 17:26:49.000000000 +0200
-+++ merkaartor-0.17.2/src/Preferences/MerkaartorPreferences.h 2011-06-10 17:29:46.000000000 +0200
-@@ -21,7 +21,7 @@
- #include
-
- #ifdef USE_LIBPROXY
--#include
-+#include
- #endif
-
- #include "Maps/Coord.h"
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
deleted file mode 100644
index 52955735e20a..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.1-system-libs.patch
+++ /dev/null
@@ -1,43 +0,0 @@
-From e4cda9c42c049577caf126e8849c4b9eba62b31b Mon Sep 17 00:00:00 2001
-From: Nikoli
-Date: Thu, 10 Oct 2013 16:28:02 +0400
-Subject: [PATCH] Support for building with system qtsingleapplication and
- quazip
-
----
- INSTALL | 1 +
- src/src.pro | 6 +++++-
- 2 files changed, 6 insertions(+), 1 deletion(-)
-
-diff --git a/INSTALL b/INSTALL
-index a828c17..022e8d0 100644
---- a/INSTALL
-+++ b/INSTALL
-@@ -33,6 +33,7 @@ TRANSDIR_MERKAARTOR= - where will the Merkaartor translations be installed
- TRANSDIR_SYSTEM= - where your global Qt translation directory is
- NODEBUG=1 - release target
- NOUSEWEBKIT - disable use of WebKit (Yahoo adapter)
-+SYSTEM_QTSA - use system copy of qtsingleapplication instead of internal
-
- see http://wiki.openstreetmap.org/wiki/Merkaartor/Compiling for the complete list
-
-diff --git a/src/src.pro b/src/src.pro
-index f23e05e..ff228b6 100644
---- a/src/src.pro
-+++ b/src/src.pro
-@@ -6,7 +6,11 @@ include (Config.pri)
- #Custom config
- include(Custom.pri)
-
--include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-+isEmpty(SYSTEM_QTSA) {
-+ include(../3rdparty/qtsingleapplication-2.6_1-opensource/src/qtsingleapplication.pri)
-+} else {
-+ CONFIG += qtsingleapplication
-+}
- include(../3rdparty/qttoolbardialog-2.2_1-opensource/src/qttoolbardialog.pri)
-
- #Qt Version
---
-2.0.5
-
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch
deleted file mode 100644
index 4bbd129db327..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-fix-qtgui-include.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
-index c05d09f..6afbfa8 100644
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -12,13 +12,13 @@
- #include
- #endif
-
--#include
--#include
--#include
-+#include
-+#include
-+#include
- #include
--#include
--#include
--#include
-+#include
-+#include
-+#include
- #include
-
- #include
-diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
-index ab7bbf6..a2606b0 100644
---- a/src/Docks/GeoImageDock.h
-+++ b/src/Docks/GeoImageDock.h
-@@ -4,9 +4,9 @@
- #include "Document.h"
-
- #include
--#include
-+#include
- #include
--#include
-+#include
- #include
- #include
-
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
deleted file mode 100644
index 8ca40f873b14..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-geoimagedock.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-diff --git a/src/Docks/GeoImageDock.cpp b/src/Docks/GeoImageDock.cpp
-index c05d09f..5cd3a98 100644
---- a/src/Docks/GeoImageDock.cpp
-+++ b/src/Docks/GeoImageDock.cpp
-@@ -458,7 +458,7 @@ void GeoImageDock::loadImages(QStringList fileNames)
-
- Exiv2::Image::AutoPtr image;
- Exiv2::ExifData exifData;
-- bool positionValid = FALSE;
-+ bool positionValid = false;
-
- Layer *theLayer;
- if (photoLayer == NULL) {
-@@ -894,7 +894,7 @@ Coord GeoImageDock::getGeoDataFromImage(const QString & file)
- double lat = 0.0, lon = 0.0;
- Exiv2::Image::AutoPtr image;
- Exiv2::ExifData exifData;
-- bool positionValid = FALSE;
-+ bool positionValid = false;
-
- if (!QFile::exists(file)) {
- return pos;
-diff --git a/src/Docks/GeoImageDock.h b/src/Docks/GeoImageDock.h
-index ab7bbf6..3153219 100644
---- a/src/Docks/GeoImageDock.h
-+++ b/src/Docks/GeoImageDock.h
-@@ -9,6 +9,7 @@
- #include
- #include
- #include
-+#include
-
- class ImageView;
-
diff --git a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch b/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
deleted file mode 100644
index ee1052c0a0c6..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-0.18.2-gpsdata-handling-gpsd-3.12.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 3f2209970cca8d9b2b977be3eab7587f72f65fbb Mon Sep 17 00:00:00 2001
-From: Bas Couwenberg
-Date: Sun, 1 Nov 2015 16:26:15 +0100
-Subject: [PATCH] Fix gpsdata handling for gpsd >= 3.12 (libgps22 |
- GPSD_API_MAJOR_VERSION 6) #76
-
----
- src/GPS/qgpsdevice.cpp | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/src/GPS/qgpsdevice.cpp b/src/GPS/qgpsdevice.cpp
-index 04889f6..b0c146a 100644
---- a/src/GPS/qgpsdevice.cpp
-+++ b/src/GPS/qgpsdevice.cpp
-@@ -1056,10 +1056,17 @@ void QGPSDDevice::onDataAvailable()
- satArray[i][0] = satArray[i][1] = satArray[i][2] = 0;
- for (int i=0; i 5
-+ int id = gpsdata->skyview[i].PRN;
-+ satArray[id][0] = gpsdata->skyview[i].elevation;
-+ satArray[id][1] = gpsdata->skyview[i].azimuth;
-+ satArray[id][2] = gpsdata->skyview[i].ss;
-+#else
- int id = gpsdata->PRN[i];
- satArray[id][0] = gpsdata->elevation[i];
- satArray[id][1] = gpsdata->azimuth[i];
- satArray[id][2] = gpsdata->ss[i];
-+#endif
- }
- setNumSatellites(num_sat);
-
diff --git a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch b/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
deleted file mode 100644
index 4197610c17f0..000000000000
--- a/sci-geosciences/merkaartor/files/merkaartor-gdal-2-fix.patch
+++ /dev/null
@@ -1,212 +0,0 @@
---- a/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
-+++ b/src/ImportExport/ImportExportGdal.cpp 2015-06-15 18:48:39.604575423 +0200
-@@ -21,10 +21,13 @@
- #include "ProjectionChooser.h"
- #include "Global.h"
-
--#include "cpl_vsi.h"
-+#include
-+#include
-+#include
-
- #include
-
-+
- bool parseContainer(QDomElement& e, Layer* aLayer);
-
- ImportExportGdal::ImportExportGdal(Document* doc)
-@@ -55,6 +58,55 @@ bool ImportExportGdal::saveFile(QString)
- bool ImportExportGdal::export_(const QList& featList)
- {
- const char *pszDriverName = "SQLite";
-+ QString fileName(HOMEDIR + "/test.sqlite");
-+#ifdef GDAL2
-+ GDALDriver *poDriver;
-+ GDALDriverManager *driverManager = GetGDALDriverManager();
-+ GDALAllRegister();
-+ driverManager->AutoLoadDrivers();
-+
-+ poDriver = driverManager->GetDriverByName(pszDriverName);
-+ if( poDriver == NULL )
-+ {
-+ qDebug( "%s driver not available.", pszDriverName );
-+ return false;
-+ }
-+
-+ /* Create create options */
-+ char **createOptions = NULL;
-+ createOptions = CSLSetNameValue( createOptions, "SPATIALITE", "YES" );
-+
-+ /* Open new dataset */
-+ GDALDataset *poDS;
-+
-+ QFile::remove(fileName);
-+ poDS = poDriver->Create( fileName.toUtf8().constData(), 0, 0, 0, GDT_Unknown, createOptions );
-+ if( poDS == NULL )
-+ {
-+ qDebug( "Creation of output file failed." );
-+ return false;
-+ }
-+ poDS->ExecuteSQL("PRAGMA synchronous = OFF", NULL, NULL);
-+
-+ /* Create Spatial reference object */
-+ OGRSpatialReference *poSRS;
-+ poSRS = new OGRSpatialReference();
-+ poSRS->importFromEPSG(4326);
-+
-+ /* Create layer options */
-+ char **layerOptions = NULL;
-+ layerOptions = CSLSetNameValue( layerOptions, "FORMAT", "SPATIALITE" );
-+ layerOptions = CSLSetNameValue( layerOptions, "SPATIAL_INDEX", "YES" );
-+
-+ /* Create layer */
-+ OGRLayer *poLayer;
-+ poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, layerOptions);
-+
-+ /* Free the options */
-+ CSLDestroy( createOptions );
-+ CSLDestroy( layerOptions );
-+#else
-+ /* This is legacy code, and is not tested at all */
- OGRSFDriver *poDriver;
-
- OGRRegisterAll();
-@@ -68,8 +120,8 @@ bool ImportExportGdal::export_(const QList& featList)
-
- OGRDataSource *poDS;
-
-- QFile::remove(QString(HOMEDIR + "/test.sqlite"));
-- poDS = poDriver->CreateDataSource( QString(HOMEDIR + "/test.sqlite").toUtf8().constData(), NULL );
-+ QFile::remove(fileName);
-+ poDS = poDriver->CreateDataSource( fileName.toUtf8().constData(), NULL );
- if( poDS == NULL )
- {
- qDebug( "Creation of output file failed." );
-@@ -89,6 +141,8 @@ bool ImportExportGdal::export_(const QList& featList)
- OGRLayer *poLayer;
- poLayer = poDS->CreateLayer( "osm", poSRS, wkbUnknown, papszOptions);
- CSLDestroy( papszOptions );
-+#endif
-+
-
- if( poLayer == NULL )
- {
-@@ -142,7 +196,11 @@ bool ImportExportGdal::export_(const QList& featList)
- }
- OGRFeature::DestroyFeature( poFeature );
- }
-+#ifdef GDAL2
-+ GDALClose( (GDALDatasetH) poDS );
-+#else
- OGRDataSource::DestroyDataSource( poDS );
-+#endif
- return true;
- }
-
-@@ -264,7 +322,11 @@ Feature* ImportExportGdal::parseGeometry(Layer* aLayer, OGRGeometry *poGeometry)
-
- // import the input
-
--bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, bool confirmProjection)
-+#ifndef GDAL2
-+#define GDALDataset OGRDataSource
-+#endif
-+bool ImportExportGdal::importGDALDataset(GDALDataset* poDS, Layer* aLayer, bool confirmProjection)
-+#undef GDALDataset
- {
- int ogrError;
-
-@@ -422,11 +484,16 @@ bool ImportExportGdal::importGDALDataset(OGRDataSource* poDS, Layer* aLayer, boo
-
- bool ImportExportGdal::import(Layer* aLayer)
- {
-+#ifdef GDAL2
-+ GDALAllRegister();
-+ GDALDataset *poDS;
-+ poDS = (GDALDataset *) GDALOpen( FileName.toUtf8().constData(), GA_ReadOnly );
-+#else
- OGRRegisterAll();
--
-- OGRDataSource *poDS;
--
-+ OGRDataSource *poDS;
- poDS = OGRSFDriverRegistrar::Open( FileName.toUtf8().constData(), FALSE );
-+#endif
-+
- if( poDS == NULL )
- {
- qDebug( "GDAL Open failed.\n" );
-@@ -435,22 +502,26 @@ bool ImportExportGdal::import(Layer* aLayer)
-
- importGDALDataset(poDS, aLayer, M_PREFS->getGdalConfirmProjection());
-
-- OGRDataSource::DestroyDataSource( poDS );
-+ GDALClose( (GDALDatasetH) poDS );
-
- return true;
- }
-
- bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmProjection)
- {
-- OGRRegisterAll();
--
-- OGRDataSource *poDS;
--// int ogrError;
--
- GByte* content = (GByte*)(ba.constData());
- /*FILE* f = */VSIFileFromMemBuffer("/vsimem/temp", content, ba.size(), FALSE);
-
-+#ifdef GDAL2
-+ GDALAllRegister();
-+ GDALDataset *poDS;
-+ poDS = (GDALDataset *) GDALOpen( "/vsimem/temp", GA_ReadOnly );
-+#else
-+ OGRRegisterAll();
-+ OGRDataSource *poDS;
- poDS = OGRSFDriverRegistrar::Open( "/vsimem/temp", FALSE );
-+#endif
-+
- if( poDS == NULL )
- {
- qDebug( "GDAL Open failed.\n" );
-@@ -458,7 +529,7 @@ bool ImportExportGdal::import(Layer* aLayer, const QByteArray& ba, bool confirmP
- }
- importGDALDataset(poDS, aLayer, confirmProjection);
-
-- OGRDataSource::DestroyDataSource( poDS );
-+ GDALClose( (GDALDatasetH) poDS );
-
- return true;
- }
---- a/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
-+++ b/src/ImportExport/ImportExportGdal.h 2015-06-15 18:50:42.884995287 +0200
-@@ -13,7 +13,15 @@
- #define ImportExportGDAL_H
-
- #include "IImportExport.h"
--#include "ogrsf_frmts.h"
-+
-+#include
-+#include
-+#include
-+#include
-+
-+#if GDAL_VERSION_MAJOR == 2
-+#define GDAL2
-+#endif
-
- class Projection;
- class Layer;
-@@ -52,7 +60,11 @@ class ImportExportGdal : public IImportExport
- Node *nodeFor(Layer* aLayer, OGRPoint point);
- Way *readWay(Layer* aLayer, OGRLineString *poRing);
-
-- bool importGDALDataset(OGRDataSource *poDs, Layer *aLayer, bool confirmProjection);
-+#ifndef GDAL2
-+#define GDALDataset OGRDataSource
-+#endif
-+ bool importGDALDataset(GDALDataset *poDs, Layer *aLayer, bool confirmProjection);
-+#undef GDALDataset
-
- private:
- QHash pointHash;
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild
deleted file mode 100644
index 211238ae8a62..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.1-r2.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
-
-inherit eutils fdo-mime gnome2-utils l10n multilib qt4-r2
-
-DESCRIPTION="A Qt4 based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy qrcode"
-
-RDEPEND="
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- dev-qt/qtwebkit:4
- >=dev-qt/qtsingleapplication-2.6.1[X,qt4(+)]
- >=sci-libs/gdal-1.6.0
- >=sci-libs/proj-4.6
- sys-libs/zlib
- exif? ( media-gfx/exiv2:= )
- gps? ( >=sci-geosciences/gpsd-2.92[cxx] )
- libproxy? ( net-libs/libproxy )
- qrcode? ( media-gfx/zbar )
-"
-DEPEND="${RDEPEND}
- >=dev-libs/boost-1.46
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CHANGELOG HACKING )
-
-src_prepare() {
- my_rm_loc() {
- sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
- rm "translations/${PN}_${1}.ts" || die
- }
-
- l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
-
- if [[ -n "$(l10n_get_locales)" ]]; then
- l10n_for_each_disabled_locale_do my_rm_loc
- $(qt4_get_bindir)/lrelease src/src.pro || die
- fi
-
- epatch "${FILESDIR}"/${P}-system-libs.patch
-
- # bug 554304 - build against gdal 2
- epatch "${FILESDIR}"/${PN}-gdal-2-fix.patch
-
- epatch_user
-}
-
-src_configure() {
- # TRANSDIR_SYSTEM is for bug #385671
- eqmake4 \
- PREFIX="${EPREFIX}/usr" \
- LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
- TRANSDIR_MERKAARTOR="${EPREFIX}/usr/share/${PN}/translations" \
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
- SYSTEM_QTSA=1 \
- RELEASE=1 \
- NODEBUG="$(usex debug '0' '1')" \
- GEOIMAGE="$(usex exif '1' '0')" \
- GPSDLIB="$(usex gps '1' '0')" \
- LIBPROXY="$(usex libproxy '1' '0')" \
- ZBAR="$(usex qrcode '1' '0')" \
- Merkaartor.pro
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild b/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
deleted file mode 100644
index e512319335b9..000000000000
--- a/sci-geosciences/merkaartor/merkaartor-0.18.2.ebuild
+++ /dev/null
@@ -1,135 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PLOCALES="ar cs de es et fr hr hu it ja nl pl pt_BR pt ru sk sv uk"
-
-inherit eutils fdo-mime gnome2-utils l10n multilib qmake-utils
-
-DESCRIPTION="A Qt based map editor for the openstreetmap.org project"
-HOMEPAGE="http://www.merkaartor.be https://github.com/openstreetmap/merkaartor"
-SRC_URI="https://github.com/openstreetmap/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="debug exif gps libproxy qrcode qt4 qt5"
-
-REQUIRED_USE="
- ^^ ( qt4 qt5 )
- qrcode? ( qt4 )
-"
-RDEPEND="
- qt4? (
- dev-qt/qtcore:4
- dev-qt/qtgui:4
- dev-qt/qtsvg:4
- dev-qt/qtwebkit:4
- )
- qt5? (
- dev-qt/qtcore:5
- dev-qt/qtgui:5
- dev-qt/qtsvg:5
- dev-qt/qtwebkit:5
- dev-qt/qtwidgets:5
- dev-qt/qtxml:5
- dev-qt/qtconcurrent:5
- dev-qt/qtprintsupport:5
- )
- >=dev-qt/qtsingleapplication-2.6.1[X,qt4?,qt5?]
- >=sci-libs/gdal-1.6.0
- >=sci-libs/proj-4.6
- sys-libs/zlib
- exif? ( media-gfx/exiv2:= )
- gps? ( >=sci-geosciences/gpsd-3.13[cxx] )
- libproxy? ( net-libs/libproxy )
- qrcode? ( media-gfx/zbar[qt4] )
-"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
-"
-
-DOCS=( AUTHORS CHANGELOG HACKING )
-
-src_prepare() {
- my_rm_loc() {
- sed -i -e "s:../translations/${PN}_${1}.\(ts\|qm\)::" src/src.pro || die
- rm "translations/${PN}_${1}.ts" || die
- }
-
- l10n_find_plocales_changes 'translations' "${PN}_" '.ts'
-
- if [[ -n "$(l10n_get_locales)" ]]; then
- l10n_for_each_disabled_locale_do my_rm_loc
- if use qt4 ; then
- $(qt4_get_bindir)/lrelease src/src.pro || die
- else
- $(qt5_get_bindir)/lrelease src/src.pro || die
- fi
- fi
-
- if use qt4 ; then
- # fix qtgui include - only for qt4
- epatch "${FILESDIR}"/"${P}"-fix-qtgui-include.patch
- fi
-
- # build system expects to be building from git
- sed -i "${S}"/src/Config.pri -e "s:SION = .*:SION = \"${PV}\":g"
-
- # Fix gpsdata handling for gpsd >= 3.12
- # https://github.com/openstreetmap/merkaartor/issues/76
- epatch "${FILESDIR}"/"${P}"-gpsdata-handling-gpsd-3.12.patch
-
- epatch "${FILESDIR}/${P}-geoimagedock.patch"
-
- epatch_user
-}
-
-src_configure() {
- # TRANSDIR_SYSTEM is for bug #385671
- if use qt4 ; then
- eqmake4 \
- PREFIX="${ED}/usr" \
- LIBDIR="${ED}/usr/$(get_libdir)" \
- TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt4/translations" \
- SYSTEM_QTSA=1 \
- RELEASE=1 \
- NODEBUG="$(usex debug '0' '1')" \
- GEOIMAGE="$(usex exif '1' '0')" \
- GPSDLIB="$(usex gps '1' '0')" \
- LIBPROXY="$(usex libproxy '1' '0')" \
- ZBAR="$(usex qrcode '1' '0')" \
- Merkaartor.pro
- else
- eqmake5 \
- PREFIX="${ED}/usr" \
- LIBDIR="${ED}/usr/$(get_libdir)" \
- TRANSDIR_MERKAARTOR="${ED}/usr/share/${PN}/translations" \
- TRANSDIR_SYSTEM="${EPREFIX}/usr/share/qt5/translations" \
- SYSTEM_QTSA=1 \
- RELEASE=1 \
- NODEBUG="$(usex debug '0' '1')" \
- GEOIMAGE="$(usex exif '1' '0')" \
- GPSDLIB="$(usex gps '1' '0')" \
- LIBPROXY="$(usex libproxy '1' '0')" \
- ZBAR="$(usex qrcode '1' '0')" \
- Merkaartor.pro
- fi
-}
-
-pkg_preinst() {
- gnome2_icon_savelist
-}
-
-pkg_postinst() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
-
-pkg_postrm() {
- fdo-mime_desktop_database_update
- gnome2_icon_cache_update
-}
diff --git a/sys-fs/dosfstools/Manifest b/sys-fs/dosfstools/Manifest
index 4d6179c34f12..e5891d7a2a37 100644
--- a/sys-fs/dosfstools/Manifest
+++ b/sys-fs/dosfstools/Manifest
@@ -1,2 +1 @@
-DIST dosfstools-3.0.28.tar.xz 82980 SHA256 ee95913044ecf2719b63ea11212917649709a6e53209a72d622135aaa8517ee2 SHA512 7325a9e05f51715b358cab0a8fa8f8096422b470f1a43eecfab2adbb954e1daf6a24003121be5b3a22de5fcb3e3adffbf1551e2158852b6663fd57a109f057ad WHIRLPOOL b584aa1dee4db96c04f19b6ac46b6322c533fcadbafb09546412e4d6a7568e23abe6985389dc446dacbe2d14f36dd7a8b52fc83b93ab1f5864b4b61f14f6ffd0
DIST dosfstools-4.0.tar.xz 157564 SHA256 9037738953559d1efe04fc5408b6846216cc0138f7f9d32de80b6ec3c35e7daf SHA512 81acf54dc87e1a8b436848b0c8c596c8b9a2f334c5b3e5496547feb243b70ef320a621a9b5afaa8b054f45a5c2184fae9ae167019f2f83aba417a10954a23a58 WHIRLPOOL eb6de4523ff2fbc7161bd75e0983148faf85d700489647ad8792abd4fb41503b85b2b2b6feb684a14d37c0c04d0307a5d885f5010f8ba386037a8e9eea512f85
diff --git a/sys-fs/dosfstools/dosfstools-3.0.28.ebuild b/sys-fs/dosfstools/dosfstools-3.0.28.ebuild
deleted file mode 100644
index 1a4acb81d4bf..000000000000
--- a/sys-fs/dosfstools/dosfstools-3.0.28.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="5"
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="DOS filesystem tools - provides mkdosfs, mkfs.msdos, mkfs.vfat"
-HOMEPAGE="https://github.com/dosfstools/dosfstools"
-SRC_URI="https://github.com/dosfstools/dosfstools/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE=""
-
-RESTRICT="test" # there is no test target #239071
-
-src_prepare() {
- sed -i \
- -e "/^PREFIX/s:=.*:= ${EPREFIX}/usr:" \
- -e '/^OPTFLAGS/d' \
- -e '/^DEBUGFLAGS/d' \
- -e "/\$(DOCDIR)/s:${PN}:${PF}:" \
- Makefile || die
- append-lfs-flags
- tc-export CC
-}
diff --git a/sys-process/glances/Manifest b/sys-process/glances/Manifest
index e28bb7416ffd..6e37a88fbb72 100644
--- a/sys-process/glances/Manifest
+++ b/sys-process/glances/Manifest
@@ -1,5 +1 @@
-DIST Glances-2.4.2.tar.gz 5497895 SHA256 31f1e4c2e129904a373f3b20d6800472375e415e01161168469ccebb320c9517 SHA512 ada7e2a9766dec54b26fa1fccac3b1abe6b9abcc16a96c6bb30d537370648732a99cff41c6c812908531a4995e118cb3d1127196184f40dee7a01a6a8a85d9b9 WHIRLPOOL 91cd5dfbe891c16bbbe5c6ae17500498c230d36a0795ba134a0384770cae04cbdf08b5236fd56157e438eaff17a7bd9cac3bc42bee7980239faf5c9fc18fc683
-DIST Glances-2.5.1.tar.gz 5807072 SHA256 d3db40ce50b7157a94195aa0076d0eadae85dc4f24557e51c3b1a4dbd972359e SHA512 ea099f5db7e73676aaedcd8b416708f2374de57afe0b8292b86f2d0e6295053f0af7bfdb51e3e6cafcb3d7f2b967b788c8d2d1ec806256d2e11b413a7e25ed98 WHIRLPOOL 64a758068436647027a602095194bffdea3cb8b8ac04107b1306f15aa69f23a2c2e9d8b2d222c18434ad5cf26f88e12dd63e4a30b17b3f8665355f0d9d8f292c
-DIST Glances-2.6.1.tar.gz 8233445 SHA256 822f0f37455d46732a059f8e2b49762edb90ad66edd61cdf869a4b3683ac2b59 SHA512 09cc8a8a96b53de14de4c0476273e1f3b9655d2d9b4d3220342851b476073ef30ea2c1ac4a33c240ead7911ec2e193398c1e1032860ace607afd4de277249c14 WHIRLPOOL 8e7742368051c6c2c7c5cdf8f093e1aaee5bca012801ac9edaf9043b7e3a3b508daa3dea199407c1ad5947b7cc001071491afc1336d877dd81a14106816888c0
DIST Glances-2.7.1.tar.gz 13277845 SHA256 afdfdb4b14ae514422c4a882788800473c6cff53719266735c9a2af400c14b86 SHA512 c13e7fb8e6025d284cfabade4eaf10189f6605f53f219889c3c636780ac11773c579f39d956a9eebcf5618de2bffec42446982fb892d775109341af74e621b83 WHIRLPOOL 119792772e45e4a23ca7ddb0e84081eb79a6e72d68311fcba42f4305ae068b105a882b8dda3d14b3f9da6fb7fa55208a125d16c4170767c623c1d1286927fa11
-DIST Glances-2.7.tar.gz 13277344 SHA256 4beab1d9532fb016a8236a7449b1ce994f391b7021d66b5cb23d8a26233ad48e SHA512 f2613207cd4f0deed88a8a1949cf78b2b2b334d2313c4b6bf0762bbc6e083b3365cd2a107a5dc52e330595a01f69c3ea8fda9278f22155fe3b16cd71d5b721c7 WHIRLPOOL 16e2d3364a4b382d278fb9d0fd3ac6e6518fd324263330fa5fe80d4159bc8e2824a18cb461810a913c4524e293f3c1e99f5c60c985dce92e58dc373f95c16374
diff --git a/sys-process/glances/files/2.4.2-setup-data.patch b/sys-process/glances/files/2.4.2-setup-data.patch
deleted file mode 100644
index b2d9d0b12319..000000000000
--- a/sys-process/glances/files/2.4.2-setup-data.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff -ur Glances-2.4.2.orig/setup.py Glances-2.4.2/setup.py
---- setup.py 2015-05-29 04:10:10.000000000 +0800
-+++ setup.py 2015-07-10 14:47:54.333415133 +0800
-@@ -13,9 +13,7 @@
-
- def get_data_files():
- data_files = [
-- ('share/doc/glances', ['AUTHORS', 'COPYING', 'NEWS', 'README.rst',
-- 'conf/glances.conf', 'docs/glances-doc.html']),
-- ('share/doc/glances/images', glob.glob('docs/images/*.png')),
-- ('share/man/man1', ['man/glances.1'])
-+ ('share/man/man1', ['man/glances.1']),
-+ ('etc/glances', ['conf/glances.conf'])
- ]
-
diff --git a/sys-process/glances/glances-2.4.2.ebuild b/sys-process/glances/glances-2.4.2.ebuild
deleted file mode 100644
index 332f73e8dab0..000000000000
--- a/sys-process/glances/glances-2.4.2.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_4} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 linux-info
-
-MYPN=Glances
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="chart doc hddtemp snmp web"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-# There is another optional extra batinfo, absent from portage
-RDEPEND="${DEPEND}
- >=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]
- hddtemp? ( app-admin/hddtemp )
- snmp? ( dev-python/pysnmp[${PYTHON_USEDEP}] )
- web? ( dev-python/bottle[${PYTHON_USEDEP}] )
- chart? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${MYP}"
-
-# Remove duplicate entries of a prebuilt doc build and
-# ensure install of the file glances.conf in /etc/${PN}
-PATCHES=( "${FILESDIR}"/2.4.2-setup-data.patch )
-
-pkg_setup() {
- linux-info_pkg_setup
-}
-
-python_install_all() {
- # add an intended file from original data set from setup.py to DOCS
- local DOCS="README.rst conf/glances.conf"
- # setup for pre-built html docs in setup.py
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- if [[ -z ${REPLACING_VERSIONS} ]]; then
- elog "${PN} can gain additional functionality with following packages:"
- elog " dev-python/jinja - export statistics to HTML"
- elog " app-admin/hddtemp - monitor hard drive temperatures"
- elog " dev-python/pysnmp - enable Python SNMP library support"
- elog " dev-python/bottle - for Web server mode"
- elog " dev-python/matplotlib - for graphical / chart support"
- fi
- elog "A copy of glances.conf has been added to DOCS"
-}
diff --git a/sys-process/glances/glances-2.5.1.ebuild b/sys-process/glances/glances-2.5.1.ebuild
deleted file mode 100644
index 6dc2789462e0..000000000000
--- a/sys-process/glances/glances-2.5.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-MYPN=Glances
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-# There is another optional extra batinfo, absent from portage
-RDEPEND="${DEPEND}
- >=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${MYP}"
-
-# Remove duplicate entries of a prebuilt doc build and
-# ensure install of the file glances.conf in /etc/${PN}
-PATCHES=( "${FILESDIR}"/2.4.2-setup-data.patch )
-
-pkg_setup() {
- linux-info_pkg_setup
-}
-
-python_install_all() {
- # add an intended file from original data set from setup.py to DOCS
- local DOCS=( README.rst conf/glances.conf )
- # setup for pre-built html docs in setup.py
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Web server mode" dev-python/bottle
- # https://bitbucket.org/gleb_zhulik/py3sensors
- #optfeature "Hardware monitoring support" dev-python/py3sensors
- optfeature "Monitor hard drive temperatures" app-admin/hddtemp
- optfeature "Battery monitoring support" dev-python/batinfo
- optfeature "RAID support" dev-python/pymdstat
- optfeature "SNMP support" dev-python/pysnmp
- optfeature "Autodiscover mode" dev-python/zeroconf
- optfeature "IP plugin" dev-python/netifaces
- optfeature "InfluxDB export module" dev-python/influxdb
- optfeature "StatsD export module" dev-python/statsd
- optfeature "Action script feature" dev-python/pystache
- optfeature "Docker monitoring support" dev-python/docker-py
- optfeature "Graphical / chart support" dev-python/matplotlib
- optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
- optfeature "Quicklook CPU info" dev-python/py-cpuinfo
-}
diff --git a/sys-process/glances/glances-2.6.1.ebuild b/sys-process/glances/glances-2.6.1.ebuild
deleted file mode 100644
index 1d50fc063aed..000000000000
--- a/sys-process/glances/glances-2.6.1.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-MYPN=Glances
-MYP=${MYPN}-${PV}
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/${MYPN:0:1}/${MYPN}/${MYP}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-# There is another optional extra batinfo, absent from portage
-RDEPEND="${DEPEND}
- >=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${MYP}"
-
-pkg_setup() {
- linux-info_pkg_setup
-}
-
-python_prepare_all() {
- # Remove duplicate entries of a prebuilt doc build and
- # ensure install of the file glances.conf in /etc/${PN}
- sed -i -r '\|share/doc/glances|,/\),/ {
- s|.*share/doc/glances.*|("etc/glances", ["conf/glances.conf"]),|p
- d
- }' -- 'setup.py' || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- # add an intended file from original data set from setup.py to DOCS
- local DOCS=( README.rst conf/glances.conf )
- # setup for pre-built html docs in setup.py
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Action script feature" dev-python/pystache
- optfeature "Autodiscover mode" dev-python/zeroconf
- optfeature "Battery monitoring support" dev-python/batinfo
- optfeature "Docker monitoring support" dev-python/docker-py
- optfeature "Graphical/chart support" dev-python/matplotlib
- # https://bitbucket.org/gleb_zhulik/py3sensors
- # optfeature "Hardware monitoring support" dev-python/py3sensors
- optfeature "IP plugin" dev-python/netifaces
- optfeature "InfluxDB export module" dev-python/influxdb
- optfeature "Hard drive temperature monitoring" app-admin/hddtemp
- optfeature "Quicklook CPU info" dev-python/py-cpuinfo
- optfeature "RAID support" dev-python/pymdstat
- optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
- # https://github.com/banjiewen/bernhard
- # optfeature "Riemann export" dev-python/bernhard
- optfeature "SNMP support" dev-python/pysnmp
- optfeature "StatsD export module" dev-python/statsd
- optfeature "Web server mode" dev-python/bottle
-}
diff --git a/sys-process/glances/glances-2.7.1.ebuild b/sys-process/glances/glances-2.7.1.ebuild
index 9d9000396c65..3f9164475723 100644
--- a/sys-process/glances/glances-2.7.1.ebuild
+++ b/sys-process/glances/glances-2.7.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -15,7 +15,7 @@ SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
LICENSE="LGPL-3"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm x86 ~amd64-linux ~x86-linux"
IUSE="doc"
DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
diff --git a/sys-process/glances/glances-2.7.ebuild b/sys-process/glances/glances-2.7.ebuild
deleted file mode 100644
index 9d9000396c65..000000000000
--- a/sys-process/glances/glances-2.7.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-PYTHON_COMPAT=( python{2_7,3_{4,5}} )
-PYTHON_REQ_USE="ncurses"
-
-inherit distutils-r1 eutils linux-info
-
-DESCRIPTION="CLI curses based monitoring tool"
-HOMEPAGE="https://github.com/nicolargo/glances"
-SRC_URI="mirror://pypi/G/${PN^}/${P^}.tar.gz"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-# There is another optional extra batinfo, absent from portage
-RDEPEND="${DEPEND}
- >=dev-python/psutil-2.0.0[${PYTHON_USEDEP}]"
-
-CONFIG_CHECK="~TASK_IO_ACCOUNTING ~TASK_DELAY_ACCT ~TASKSTATS"
-
-S="${WORKDIR}/${P^}"
-
-pkg_setup() {
- linux-info_pkg_setup
-}
-
-python_prepare_all() {
- # Remove duplicate entries of a prebuilt doc build and
- # ensure install of the file glances.conf in /etc/${PN}
- sed \
- -e '/share\/doc\/glances/d' \
- -e "s:'conf/glances.conf':('etc/glances', ['conf/glances.conf':g" \
- -i setup.py || die
-
- distutils-r1_python_prepare_all
-}
-
-python_install_all() {
- # add an intended file from original data set from setup.py to DOCS
- local DOCS=( README.rst conf/glances.conf )
- # setup for pre-built html docs in setup.py
- use doc && local HTML_DOCS=( docs/_build/html/. )
-
- distutils-r1_python_install_all
-}
-
-pkg_postinst() {
- optfeature "Action script feature" dev-python/pystache
- optfeature "Autodiscover mode" dev-python/zeroconf
- optfeature "Battery monitoring support" dev-python/batinfo
- optfeature "Docker monitoring support" dev-python/docker-py
- optfeature "Graphical/chart support" dev-python/matplotlib
- # https://bitbucket.org/gleb_zhulik/py3sensors
- # optfeature "Hardware monitoring support" dev-python/py3sensors
- optfeature "IP plugin" dev-python/netifaces
- optfeature "InfluxDB export module" dev-python/influxdb
- optfeature "Hard drive temperature monitoring" app-admin/hddtemp
- optfeature "Quicklook CPU info" dev-python/py-cpuinfo
- optfeature "RAID support" dev-python/pymdstat
- optfeature "RabbitMQ/ActiveMQ export module" dev-python/pika
- # https://github.com/banjiewen/bernhard
- # optfeature "Riemann export" dev-python/bernhard
- optfeature "SNMP support" dev-python/pysnmp
- optfeature "StatsD export module" dev-python/statsd
- optfeature "Web server mode" dev-python/bottle
-}
diff --git a/sys-process/glances/metadata.xml b/sys-process/glances/metadata.xml
index b934c7d2e61f..e4007e574af0 100644
--- a/sys-process/glances/metadata.xml
+++ b/sys-process/glances/metadata.xml
@@ -8,12 +8,6 @@
Glances is a cross-platform curses-based monitoring tool written in Python.
-
Glances
nicolargo/glances